diff --git a/core/src/main/java/org/jboss/modcluster/ModClusterService.java b/core/src/main/java/org/jboss/modcluster/ModClusterService.java
index 42dab213..7c21ae26 100644
--- a/core/src/main/java/org/jboss/modcluster/ModClusterService.java
+++ b/core/src/main/java/org/jboss/modcluster/ModClusterService.java
@@ -184,6 +184,7 @@ public synchronized void shutdown() {
         }
 
         this.mcmpHandler.shutdown();
+        this.established = false;
     }
 
     @Override
diff --git a/core/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java b/core/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
index 1bdb6c4e..29d4d273 100644
--- a/core/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
+++ b/core/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
@@ -119,6 +119,7 @@ public void init(Collection<ProxyConfiguration> proxies, MCMPConnectionListener
                     this.add(proxy.getRemoteAddress(), proxy.getLocalAddress());
                 }
 
+                this.processPendingDiscoveryEvents();
                 this.status(false);
             } finally {
                 lock.unlock();
@@ -131,6 +132,7 @@ public void init(Collection<ProxyConfiguration> proxies, MCMPConnectionListener
     @Override
     public void shutdown() {
         this.init = false;
+        this.established.set(false);
 
         Lock lock = this.proxiesLock.readLock();
         lock.lock();