diff --git a/app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java b/app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
index b20f8a8..01ae2f3 100644
--- a/app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
+++ b/app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
@@ -31,7 +31,9 @@ public final class ConnectedLayer extends Layer {
 		new EventFlow().addPostEvent(new NetworkEvents.SendLogin(this.clientId, this.user)).postEvent();
 		new EventFlow().listen(this::handleReceivedChallenge);
 
-		new Thread(this::populatePlayerList).start();
+		Thread popThread = new Thread(this::populatePlayerList);
+        popThread.setDaemon(false);
+        popThread.start();
 
         reload();
 	}
@@ -57,7 +59,7 @@ public final class ConnectedLayer extends Layer {
 		};
 
 		Timer pollTimer = new Timer();
-		pollTimer.schedule(task, 0L, 5000L);
+		pollTimer.schedule(task, 0L, 5000L); // TODO: Block app exit, fix later
 	}
 
 	private void sendChallenge(String oppUsername, String gameType) {
diff --git a/app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java b/app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
index f98e30a..ffe9a92 100644
--- a/app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
+++ b/app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
@@ -74,8 +74,11 @@ public final class TicTacToeLayer extends Layer {
 					.addPostEvent(NetworkEvents.StartClient.class,
 							information.serverIP(),
 							Integer.parseInt(information.serverPort()))
-					.onResponse(NetworkEvents.StartClientResponse.class, event ->
-							new Thread(() -> serverGameThread(event)).start())
+					.onResponse(NetworkEvents.StartClientResponse.class, event -> {
+                        Thread a = new Thread(() -> serverGameThread(event));
+                        a.setDaemon(false);
+                        a.start();
+                    })
 					.postEvent();
 		}