diff --git a/client/tomcatconf/components-premium.xml.in b/client/tomcatconf/components-premium.xml.in
index 873a0d0601b..5cfbbf19b76 100755
--- a/client/tomcatconf/components-premium.xml.in
+++ b/client/tomcatconf/components-premium.xml.in
@@ -10,18 +10,6 @@
         <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl">
              <param name="premium">true</param>
         </dao>
-        <adapters key="com.cloud.ha.Investigator">
-            <adapter name="SimpleInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator"/>
-            <adapter name="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator"/>
-            <adapter name="PingInvestigator" class="com.cloud.ha.UserVmDomRInvestigator"/>
-			<adapter name="ManagementIPSysVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator"/>
-            <adapter name="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator"/>
-        </adapters>
-        <adapters key="com.cloud.ha.FenceBuilder">
-            <adapter name="XenServerFenceBuilder" class="com.cloud.ha.XenServerFencer"/>
-            <adapter name="KVMFenceBuilder" class="com.cloud.ha.KVMFencer"/>
-            <adapter name="VmwareFenceBuilder" class="com.cloud.ha.VmwareFencer"/>
-        </adapters>
         <adapters key="com.cloud.network.guru.NetworkGuru">
             <adapter name="ExternalGuestNetworkGuru" class="com.cloud.network.guru.ExternalGuestNetworkGuru"/>
             <adapter name="OvsGuestNetworkGuru" class="com.cloud.network.guru.OvsGuestNetworkGuru"/>
diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index 28746bfbdcd..5e536df7cdf 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -70,10 +70,10 @@
         </adapters>
         <adapters key="com.cloud.ha.Investigator">
             <adapter name="SimpleInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator"/>
-            <adapter name="PingInvestigator" class="com.cloud.ha.UserVmDomRInvestigator"/>
-            <adapter name="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator"/>
-			<adapter name="ManagementIPSysVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator"/>
             <adapter name="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator"/>
+            <adapter name="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator"/>
+            <adapter name="PingInvestigator" class="com.cloud.ha.UserVmDomRInvestigator"/>
+			<adapter name="ManagementIPSysVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator"/>
         </adapters>
         <adapters key="com.cloud.ha.FenceBuilder">
             <adapter name="XenServerFenceBuilder" class="com.cloud.ha.XenServerFencer"/>
diff --git a/server/src/com/cloud/ha/VmwareInvestigator.java b/server/src/com/cloud/ha/VmwareInvestigator.java
index 8eb0995ef95..c7d4a18fdf0 100644
--- a/server/src/com/cloud/ha/VmwareInvestigator.java
+++ b/server/src/com/cloud/ha/VmwareInvestigator.java
@@ -21,6 +21,7 @@ import javax.ejb.Local;
 
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VMInstanceVO;
 
@@ -31,11 +32,18 @@ public class VmwareInvestigator extends AdapterBase implements Investigator {
     
     @Override
     public Status isAgentAlive(HostVO agent) {
+    	if(agent.getHypervisorType() == HypervisorType.VMware)
+    		return Status.Disconnected;
+    	
     	return null;
     }
     
     @Override
     public Boolean isVmAlive(VMInstanceVO vm, HostVO host) {
+    	if(vm.getHypervisorType() == HypervisorType.VMware)
+    		return true;
+    	
     	return null;
     }
 }
+