diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 23c723b44cd..0b9cfc80046 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1815,15 +1815,12 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
 					}
         		}
             }
-               else if(info == null && vm.getState() == State.Stopping) { //Handling CS-13376
-                  Host host = _hostDao.findByGuid(info.getHosUuid());
-                  if(host != null ){
-                        s_logger.warn("Marking the VM as Stopped as it was still stopping on the CS" +info.name);
+              else if(info == null && vm.getState() == State.Stopping) { //Handling CS-13376
+                        s_logger.warn("Marking the VM as Stopped as it was still stopping on the CS" +vm.getName());
                         vm.setState(State.Stopped); // Setting the VM as stopped on the DB and clearing it from the host
+                        vm.setLastHostId(vm.getHostId());
                         vm.setHostId(null);
-                        vm.setLastHostId(host.getId());
                         _vmDao.persist(vm);
-                     }
                  }
         }