diff --git a/Server/src/main/java/core/game/system/SystemTermination.java b/Server/src/main/java/core/game/system/SystemTermination.java
index d92b228ad..91475ff08 100644
--- a/Server/src/main/java/core/game/system/SystemTermination.java
+++ b/Server/src/main/java/core/game/system/SystemTermination.java
@@ -78,7 +78,8 @@ public final class SystemTermination {
 				e.printStackTrace();
 			}
 		}
-		while(!Repository.getDisconnectionQueue().isEmpty()){
+		long start = System.currentTimeMillis();
+		while(!Repository.getDisconnectionQueue().isEmpty() && System.currentTimeMillis() - start < 5000L){
 			Repository.getDisconnectionQueue().update();
 			try {
 				Thread.sleep(100);