diff --git a/2006Redone Server/src/com/rebotted/GameEngine.java b/2006Redone Server/src/com/rebotted/GameEngine.java
index 6bd717b4..2d8b215d 100644
--- a/2006Redone Server/src/com/rebotted/GameEngine.java	
+++ b/2006Redone Server/src/com/rebotted/GameEngine.java	
@@ -213,7 +213,14 @@ public class GameEngine {
 			}
 		}, 0, GameConstants.CYCLE_TIME, TimeUnit.MILLISECONDS);
 		
-		
+		try {
+			while (!scheduler.awaitTermination(60, TimeUnit.SECONDS)) {
+				// TODO
+				// Cleanup?
+			}
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
 		
 		acceptor = null;
 		connectionHandler = null;