diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 653438586b1..7c4e37259ce 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1077,6 +1077,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                 if (getVmState(vmMo) != State.Stopped)
                     vmMo.safePowerOff(_shutdown_waitMs);
                 vmMo.tearDownDevices(new Class<?>[] { VirtualDisk.class, VirtualEthernetCard.class });
+                vmMo.ensureScsiDeviceController();
             } else {
                 ManagedObjectReference morDc = hyperHost.getHyperHostDatacenter();
                 assert (morDc != null);
@@ -1091,7 +1092,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
 
                     if (getVmState(vmMo) != State.Stopped)
                         vmMo.safePowerOff(_shutdown_waitMs);
-                    vmMo.tearDownDevices(new Class<?>[] { VirtualDisk.class, VirtualEthernetCard.class });
+                    vmMo.tearDownDevices(new Class<?>[] { VirtualDisk.class, VirtualEthernetCard.class });
+                    vmMo.ensureScsiDeviceController();
                 } else {
                     int ramMb = (int) (vmSpec.getMinRam() / (1024 * 1024));
                     Pair<ManagedObjectReference, DatastoreMO> rootDiskDataStoreDetails = null;
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 6b4e0a1fae9..e86b604aa33 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -81,6 +81,7 @@ import com.vmware.vim25.VirtualMachineSnapshotInfo;
 import com.vmware.vim25.VirtualMachineSnapshotTree;
 import com.vmware.vim25.VirtualPCIController;
 import com.vmware.vim25.VirtualSCSIController;
+import com.vmware.vim25.VirtualSCSISharing;
 
 public class VirtualMachineMO extends BaseMO {
     private static final Logger s_logger = Logger.getLogger(VirtualMachineMO.class);
@@ -1526,7 +1527,43 @@ public class VirtualMachineMO extends BaseMO {
 	    assert(false);
 	    throw new Exception("SCSI Controller Not Found");
 	}
-
+
+	public int getScsiDeviceControllerKeyNoException() throws Exception {
+	    VirtualDevice[] devices = (VirtualDevice [])_context.getServiceUtil().
+	    	getDynamicProperty(_mor, "config.hardware.device");
+		
+	    if(devices != null && devices.length > 0) {
+	    	for(VirtualDevice device : devices) {
+                if(device instanceof VirtualLsiLogicController) {
+                    return device.getKey();
+                }
+            }
+	    }
+	    
+	    return -1;
+	}
+	
+	public void ensureScsiDeviceController() throws Exception {
+		int scsiControllerKey = getScsiDeviceControllerKeyNoException();
+		if(scsiControllerKey < 0) {
+			VirtualMachineConfigSpec vmConfig = new VirtualMachineConfigSpec();
+
+			// Scsi controller
+			VirtualLsiLogicController scsiController = new VirtualLsiLogicController();
+			scsiController.setSharedBus(VirtualSCSISharing.noSharing);
+			scsiController.setBusNumber(0);
+			scsiController.setKey(1);
+			VirtualDeviceConfigSpec scsiControllerSpec = new VirtualDeviceConfigSpec();
+			scsiControllerSpec.setDevice(scsiController);
+			scsiControllerSpec.setOperation(VirtualDeviceConfigSpecOperation.add);
+
+			vmConfig.setDeviceChange(new VirtualDeviceConfigSpec[] { scsiControllerSpec });
+			if(configureVm(vmConfig)) {
+				throw new Exception("Unable to add Scsi controller");
+			}
+		}
+	}
+	
 	// return pair of VirtualDisk and disk device bus name(ide0:0, etc)
 	public Pair<VirtualDisk, String> getDiskDevice(String vmdkDatastorePath, boolean matchExactly) throws Exception {
 		VirtualDevice[] devices = (VirtualDevice[])_context.getServiceUtil().getDynamicProperty(_mor, "config.hardware.device");