diff --git a/src/plugins/plugin_xep_0060.py b/src/plugins/plugin_xep_0060.py
index 99e6d4e4..2b02024e 100755
--- a/src/plugins/plugin_xep_0060.py
+++ b/src/plugins/plugin_xep_0060.py
@@ -121,7 +121,11 @@ class XEP_0060(object):
     @defer.inlineCallbacks
     def profileConnected(self, client):
         client.pubsub_watching = set()
-        client.pubsub_service = yield self.host.findServiceEntity(client, "pubsub", "service")
+        try:
+            client.pubsub_service = jid.JID(self.host.memory.getConfig('', 'pubsub_service'))
+        except RuntimeError:
+            log.info(_(u"Can't retrieve pubsub_service from conf, we'll use first one that we find"))
+            client.pubsub_service = yield self.host.findServiceEntity(client, "pubsub", "service")
 
     def getFeatures(self, profile):
         try: