diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 9a13c1aad6c..d17a2dc725d 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -64,7 +64,7 @@ class Discussion
   end
 
   def resolved?
-    notes.none?(&:to_be_resolved?)
+    resolvable? && notes.none?(&:to_be_resolved?)
   end
 
   def to_be_resolved?