diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index c52c2cc45b3..71c520c4256 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -3789,7 +3789,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
     @Override
     public StartupCommand[] initialize() throws IllegalArgumentException {
     	_host.pool = getRealPoolUuid();
-        disconnected();
+
         setupServer();
 
         if (!getHostInfo()) {
diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index 427616f1250..5cd1ef4c5bf 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -231,7 +231,7 @@ public class XenServerConnectionPool {
     
             Member member = info.refs.remove(uuid);
             
-            if (info.refs.size() == 0 || ( member != null && member.ipAddr.equals(info.masterIp) )) {
+            if (info.refs.size() == 0 ) {
                 cleanup(poolUuid);
             }
         }