diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs
index 702cc4da6..60b4feeda 100644
--- a/vmm/src/lib.rs
+++ b/vmm/src/lib.rs
@@ -1381,11 +1381,17 @@ impl RequestHandler for Vmm {
     }
 
     fn vm_shutdown(&mut self) -> result::Result<(), VmError> {
-        if let Some(ref mut vm) = self.vm.take() {
+        let r = if let Some(ref mut vm) = self.vm.take() {
             vm.shutdown()
         } else {
             Err(VmError::VmNotRunning)
+        };
+
+        if r.is_ok() {
+            event!("vm", "shutdown");
         }
+
+        r
     }
 
     fn vm_reboot(&mut self) -> result::Result<(), VmError> {
diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index c61cfa643..80a96ea68 100644
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -1397,8 +1397,6 @@ impl Vm {
         }
         *state = new_state;
 
-        event!("vm", "shutdown");
-
         Ok(())
     }