diff --git a/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index f54ac66e046..3e36e4876eb 100644
--- a/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -714,8 +714,10 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
         
             clonedVm.exportVm(exportPath, exportName, true, true);
         } finally {
-            if(clonedVm != null)
-                clonedVm.destroy();
+            if(clonedVm != null) {
+                clonedVm.detachAllDisks();
+                clonedVm.destroy();
+            }
         }
     }