diff --git a/plone/app/discussion/browser/conversation.py b/plone/app/discussion/browser/conversation.py
index 1592e1a..e605354 100644
--- a/plone/app/discussion/browser/conversation.py
+++ b/plone/app/discussion/browser/conversation.py
@@ -80,7 +80,7 @@ class ConversationView(object):
         if folder_allow_discussion:
             if not getattr(self, 'allow_discussion', None):
                 return True
-        elif not folder_allow_discussion:
+        else:
             if obj_flag:
                 return True