diff --git a/src/plugins/plugin_xep_0060.py b/src/plugins/plugin_xep_0060.py
index 8ce33e19..3db85c92 100755
--- a/src/plugins/plugin_xep_0060.py
+++ b/src/plugins/plugin_xep_0060.py
@@ -113,12 +113,7 @@ class XEP_0060(object):
 
     @defer.inlineCallbacks
     def profileConnected(self, client):
-        pubsub_services = yield self.host.findServiceEntities(client, "pubsub", "service")
-        if pubsub_services:
-            # we use one of the found services as our default pubsub service
-            client.pubsub_service = pubsub_services.pop()
-        else:
-            client.pubsub_service = None
+        client.pubsub_service = yield self.host.findServiceEntity(client, "pubsub", "service")
 
     def getFeatures(self, profile):
         try: