diff --git a/gajim/gtk/accounts.py b/gajim/gtk/accounts.py
index 093f34d5e19ba3d2fede1ad31ae5ac054363027e..a6837a95cc98a56a9a012a3b7a8aae3bfee14006 100644
--- a/gajim/gtk/accounts.py
+++ b/gajim/gtk/accounts.py
@@ -61,6 +61,9 @@ def __init__(self):
         self.add(box)
 
         for account in app.get_accounts_sorted():
+            if account == 'Local':
+                # Disable zeroconf support until its working again
+                continue
             self.add_account(account, initial=True)
 
         self._menu.connect('menu-activated', self._on_menu_activated)
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 705da90fa864b5f535f5cb108c90f831afaf7861..72cbcf6f325096d9af4c70963626833c637181bc 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -1969,10 +1969,10 @@ def __init__(self):
         self.register_core_handlers()
 
         self.create_zeroconf_default_config()
-        if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'active') \
-        and app.is_installed('ZEROCONF'):
-            app.connections[app.ZEROCONF_ACC_NAME] = \
-                connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME)
+        # if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'active') \
+        # and app.is_installed('ZEROCONF'):
+        #     app.connections[app.ZEROCONF_ACC_NAME] = \
+        #         connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME)
 
         for account in app.config.get_per('accounts'):
             if not app.config.get_per('accounts', account, 'is_zeroconf') and\