diff --git a/src/im_mad/remotes/lib/vcenter_cluster.rb b/src/im_mad/remotes/lib/vcenter_cluster.rb
index 9c39a5c0e4..176b23dbd6 100644
--- a/src/im_mad/remotes/lib/vcenter_cluster.rb
+++ b/src/im_mad/remotes/lib/vcenter_cluster.rb
@@ -259,7 +259,13 @@ class Cluster
         vms = {}
         vms_hash.each do |vm_ref, info|
             one_id = -1
-            ids    = vmpool.retrieve_xmlelements("/VM_POOL/VM[DEPLOY_ID = '#{vm_ref}']")
+
+            # Add OR to retrieve VMs that are using old deploy ID
+            ids    = vmpool.retrieve_xmlelements(
+                "/VM_POOL/VM[(DEPLOY_ID = '#{vm_ref}')" \
+                ' or ' \
+                "(DEPLOY_ID = '#{vm_ref.split('_')[0]}')]"
+            )
 
             ids.select do |vm|
                 hid = vm['HISTORY_RECORDS/HISTORY/HID']