diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index 7ed090db9ff..013eb411ad8 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1666,9 +1666,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                 }
 
                 guru.finalizeStop(profile, answer);
-                final UserVmVO userVm = _userVmDao.findById(vm.getId());
-                userVm.setPowerState(PowerState.PowerOff);
-                _userVmDao.update(userVm.getId(), userVm);
+                if (vm.getType() == VirtualMachine.Type.User) {
+                    final UserVmVO userVm = _userVmDao.findById(vm.getId());
+                    userVm.setPowerState(PowerState.PowerOff);
+                    _userVmDao.update(userVm.getId(), userVm);
+                }
             } else {
                 s_logger.error("Invalid answer received in response to a StopCommand for " + vm.getInstanceName());
                 return false;