diff --git a/organize/comment/browser.py b/organize/comment/browser.py
index 6981089..572e7f8 100644
--- a/organize/comment/browser.py
+++ b/organize/comment/browser.py
@@ -86,6 +86,8 @@ class CommentsView(NodeView):
         return result
 
     def getActionsFor(self, comment):
+        if not self.globalOptions('organize.showCommentState'):
+            return []
         if not checkPermission('loops.ViewRestricted', self.context):
             return []
         trackUid = util.getUidForObject(comment.track)