diff --git a/src/chat_control.py b/src/chat_control.py
index 4e9c68b7ac6072292ded1f59201f8377e1c1ab5f..6b3c601b3810d76db72c37e21e90201165de785b 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1744,10 +1744,14 @@ class ChatControl(ChatControlBase):
                     "him or her a file."))
 
         # Convert to GC
-        if self.contact.supports(NS_MUC):
-            self._convert_to_gc_button.set_sensitive(True)
+        if gajim.config.get_per('accounts', self.account, 'is_zeroconf'):
+            self._convert_to_gc_button.set_no_show_all(True)
+            self._convert_to_gc_button.hide()
         else:
-            self._convert_to_gc_button.set_sensitive(False)
+            if self.contact.supports(NS_MUC):
+                self._convert_to_gc_button.set_sensitive(True)
+            else:
+                self._convert_to_gc_button.set_sensitive(False)
 
         # Information
         if gajim.account_is_disconnected(self.account):