diff --git a/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index 2211deff8a4..f54ac66e046 100644
--- a/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -507,8 +507,10 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
             return new Ternary<String, Long, Long>(installPath + "/" + templateName + ".ova", size, size);
             
         } finally {
-            if(clonedVm != null)
-                clonedVm.destroy();
+            if(clonedVm != null) {
+                clonedVm.detachAllDisks();
+                clonedVm.destroy();
+            }
         
             vmMo.removeSnapshot(tmpSnapshotName, false);
         }
@@ -656,8 +658,10 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
             clonedVm.moveAllVmDiskFiles(primaryDsMo, "", false);
             clonedVm.detachAllDisks();
         } finally {
-            if(clonedVm != null)
-                clonedVm.destroy();
+            if(clonedVm != null) {
+                clonedVm.detachAllDisks();
+                clonedVm.destroy();
+            }
         }
     }