diff --git a/src/im_mad/remotes/lib/nsx.rb b/src/im_mad/remotes/lib/nsx.rb
index 05c6bda148..d99a3c21d6 100644
--- a/src/im_mad/remotes/lib/nsx.rb
+++ b/src/im_mad/remotes/lib/nsx.rb
@@ -124,7 +124,7 @@ class NsxMonitor
 
         # Check if NSX_MANAGER is into the host template
         if [nil, ''].include?(@one_item['TEMPLATE/NSX_MANAGER'])
-            @nsx_status = "NSX_STATUS = \"Missing NSX_MANAGER\"\n"
+            @nsx_status = ''
             return false
         end
 
@@ -147,9 +147,7 @@ class NsxMonitor
         end
 
         # Try a connection as part of NSX_STATUS
-        nsx_client = NSXDriver::NSXClient
-                     .new_from_id(@vi_client.instance_variable_get(:@host_id)
-                     .to_i)
+        nsx_client = NSXDriver::NSXClient.new_from_id(@host_id.to_i)
 
         if @one_item['TEMPLATE/NSX_TYPE'] == NSXDriver::NSXConstants::NSXV
             # URL to test a connection
diff --git a/src/im_mad/remotes/lib/vcenter.rb b/src/im_mad/remotes/lib/vcenter.rb
index 5787ab6912..6f991aa942 100644
--- a/src/im_mad/remotes/lib/vcenter.rb
+++ b/src/im_mad/remotes/lib/vcenter.rb
@@ -852,9 +852,6 @@ class VcenterMonitor
 
         vms = []
         vms_hash.each do |vm_ref, info|
-            # Skip VMs starting with one- in vcenter
-            next if info['name'].match(/^one-(\d*)(-(.*))?$/)
-
             one_uuid = "#{vm_ref}#{@vc_uuid}"
 
             vm = { :uuid => one_uuid,
diff --git a/src/vnm_mad/remotes/vcenter/clean b/src/vnm_mad/remotes/vcenter/clean
index 5bd3240318..8c90a8c6ab 100755
--- a/src/vnm_mad/remotes/vcenter/clean
+++ b/src/vnm_mad/remotes/vcenter/clean
@@ -65,13 +65,9 @@ if OpenNebula.is_error?(rc)
     raise err_msg
 end
 
-# Exit with error if NSX_STATUS != OK
+# Exit if there is no NSX
 nsx_status = one_host['TEMPLATE/NSX_STATUS']
-unless nsx_status == 'OK'
-    OpenNebula.log_error('NSX_STATUS is not OK')
-    OpenNebula.error_message('NSX_STATUS is not OK')
-    exit 1
-end
+exit 0 if nsx_status.nil?
 
 # Clear rules
 nsx_client = NSXDriver::NSXClient.new_from_id(one_host['ID'])
diff --git a/src/vnm_mad/remotes/vcenter/post b/src/vnm_mad/remotes/vcenter/post
index 8a7a5f5c6a..062d2d0b9b 100755
--- a/src/vnm_mad/remotes/vcenter/post
+++ b/src/vnm_mad/remotes/vcenter/post
@@ -67,6 +67,10 @@ if OpenNebula.is_error?(rc)
     raise err_msg
 end
 
+# Exit if there is no NSX
+nsx_status = one_host['TEMPLATE/NSX_STATUS']
+exit 0 if nsx_status.nil?
+
 # OpenNebula VM
 vmid = template_xml.xpath('//VM/ID')
 one_vm = VCenterDriver::VIHelper.one_item(OpenNebula::VirtualMachine, vmid)
diff --git a/src/vnm_mad/remotes/vcenter/pre b/src/vnm_mad/remotes/vcenter/pre
index acfa2319f8..c2199d9379 100755
--- a/src/vnm_mad/remotes/vcenter/pre
+++ b/src/vnm_mad/remotes/vcenter/pre
@@ -60,8 +60,10 @@ if OpenNebula.is_error?(rc)
     raise err_msg
 end
 
-# Exit with error if NSX_STATUS != OK
+# Exit if there is no NSX
 nsx_status = one_host['TEMPLATE/NSX_STATUS']
+exit 0 if nsx_status.nil?
+
 unless nsx_status == 'OK'
     OpenNebula.log_error('NSX_STATUS is not OK')
     OpenNebula.error_message('NSX_STATUS is not OK')