diff --git a/src/server.rs b/src/server.rs
index eee890a..e717057 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -601,12 +601,21 @@ async fn stop_server_signal(config: &Config, server: &Server) -> bool {
     }
 
     // Update from starting/started to stopping
+
+    /* TODO uncomment this and add a config option
     server
         .update_state_from(Some(State::Starting), State::Stopping, config)
         .await;
     server
         .update_state_from(Some(State::Started), State::Stopping, config)
         .await;
+    */
+    server
+        .update_state_from(Some(State::Starting), State::Stopped, config)
+        .await;
+    server
+        .update_state_from(Some(State::Started), State::Stopped, config)
+        .await;
 
     true
 }