diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 54d72d95e11..8a1b719ec2d 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1815,6 +1815,18 @@ 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);
+                        vm.setState(State.Stopped); // Setting the VM as stopped on the DB and clearing it from the host
+                        vm.setHostId(null);
+                        vm.setLastHostId(host.getId());
+                        _vmDao.persist(vm); 
+                     }
+
+                 }
             
         }