diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
index 636ea90d8..9e414a29c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
@@ -117,8 +117,6 @@ public class ServiceDiscoveryManager extends Manager {
      */
     private ServiceDiscoveryManager(XMPPConnection connection) {
         super(connection);
-        // Register the new instance and associate it with the connection 
-        instances.put(connection, this);
 
         addFeature(DiscoverInfo.NAMESPACE);
         addFeature(DiscoverItems.NAMESPACE);
@@ -293,6 +291,8 @@ public class ServiceDiscoveryManager extends Manager {
         ServiceDiscoveryManager sdm = instances.get(connection);
         if (sdm == null) {
             sdm = new ServiceDiscoveryManager(connection);
+            // Register the new instance and associate it with the connection
+            instances.put(connection, sdm);
         }
         return sdm;
     }