diff --git a/gajim/common/modules/pubsub.py b/gajim/common/modules/pubsub.py
index e45a5dba49af5fa989bdfe20f686b62427eb7b22..782e836d8d670a39e5ecacbbad9e0493973aab2e 100644
--- a/gajim/common/modules/pubsub.py
+++ b/gajim/common/modules/pubsub.py
@@ -44,8 +44,9 @@ def __init__(self, con):
         self.publish_options = False
 
     def pass_disco(self, info):
-        self._log.info('Discovered Pubsub publish options: %s', info.jid)
-        self.publish_options = True
+        if Namespace.PUBSUB_PUBLISH_OPTIONS in info.features:
+            self._log.info('Discovered Pubsub publish options: %s', info.jid)
+            self.publish_options = True
 
     def send_pb_subscription_query(self, jid, cb, **kwargs):
         if not app.account_is_available(self._account):