diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 3a08d04f039..24106dfe0a8 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -2795,7 +2795,12 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
     public void cleanupVolumes(Long vmId){
         List<VolumeVO> volumesForVm = _volsDao.findByInstance(vmId);    	
     	for(VolumeVO vol : volumesForVm){
-    		destroyVolume(vol);
+    		if(vol.getVolumeType().equals(VolumeType.ROOT)){
+    			destroyVolume(vol);
+    		} else {
+    			//data volume
+    			_volsDao.detachVolume(vol.getId());
+    		}
     	}
     }
 }