diff --git a/modules/llama_cpp_server.py b/modules/llama_cpp_server.py
index aa712541..30823625 100644
--- a/modules/llama_cpp_server.py
+++ b/modules/llama_cpp_server.py
@@ -398,6 +398,7 @@ class LlamaServer:
     def stop(self):
         """Stop the server process."""
         if self.process:
+            logger.info("Terminating llama-server...")
             self.process.terminate()
             try:
                 self.process.wait(timeout=5)
diff --git a/server.py b/server.py
index c22ed1f1..516253f7 100644
--- a/server.py
+++ b/server.py
@@ -60,6 +60,13 @@ from modules.utils import gradio
 
 def signal_handler(sig, frame):
     logger.info("Received Ctrl+C. Shutting down Text generation web UI gracefully.")
+
+    # Try to stop the model if loaded
+    try:
+        shared.model.stop()
+    except:
+        pass
+
     sys.exit(0)