diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 9a13c1aad6cc748571576f6949eb43ebfacfbd17..d17a2dc725dae3b63ea8314f6e89ca13c73cd2ea 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?