diff --git a/Server/src/main/java/core/game/system/SystemShutdownHook.java b/Server/src/main/java/core/game/system/SystemShutdownHook.java
index 707a4ae2c..f0ec27a1e 100644
--- a/Server/src/main/java/core/game/system/SystemShutdownHook.java
+++ b/Server/src/main/java/core/game/system/SystemShutdownHook.java
@@ -14,6 +14,6 @@ public final class SystemShutdownHook implements Runnable {
 			return;
 		}
 		SystemLogger.logInfo("[SystemShutdownHook] Terminating...");
-		SystemManager.getTerminator().terminate();
+		SystemManager.flag(SystemState.TERMINATED);
 	}
 }
\ No newline at end of file
diff --git a/Server/src/main/kotlin/rs09/Server.kt b/Server/src/main/kotlin/rs09/Server.kt
index a295b5ce1..5dc21f1f7 100644
--- a/Server/src/main/kotlin/rs09/Server.kt
+++ b/Server/src/main/kotlin/rs09/Server.kt
@@ -109,7 +109,8 @@ object Server {
                         it.flush()
                         it.close()
                     }
-                    exitProcess(0)
+                    if(!SystemManager.isTerminated())
+                        exitProcess(0)
                 }
                 delay(625)
             }