diff --git a/src/main/java/fr/insa/clavardator/chat/ChatHistory.java b/src/main/java/fr/insa/clavardator/chat/ChatHistory.java
index 87870f9..6095eb4 100644
--- a/src/main/java/fr/insa/clavardator/chat/ChatHistory.java
+++ b/src/main/java/fr/insa/clavardator/chat/ChatHistory.java
@@ -59,6 +59,7 @@ public class ChatHistory {
 			@Override
 			public void run() {
 				Platform.runLater(() -> notifyHistoryLoaded());
+				t.cancel();
 			}
 		}, 1000);
 	}
diff --git a/src/main/java/fr/insa/clavardator/ui/MainController.java b/src/main/java/fr/insa/clavardator/ui/MainController.java
index 89e9101..2c07b7b 100644
--- a/src/main/java/fr/insa/clavardator/ui/MainController.java
+++ b/src/main/java/fr/insa/clavardator/ui/MainController.java
@@ -86,6 +86,7 @@ public class MainController implements Initializable {
 			@Override
 			public void run() {
 				Platform.runLater(() -> CurrentUser.getInstance().setState(CurrentUser.State.VALID));
+				t.cancel();
 			}
 		}, 3000);
 
diff --git a/src/main/java/fr/insa/clavardator/ui/dialogs/EditUsernameDialogController.java b/src/main/java/fr/insa/clavardator/ui/dialogs/EditUsernameDialogController.java
index 3ea5f32..f5d83d5 100644
--- a/src/main/java/fr/insa/clavardator/ui/dialogs/EditUsernameDialogController.java
+++ b/src/main/java/fr/insa/clavardator/ui/dialogs/EditUsernameDialogController.java
@@ -54,6 +54,7 @@ public class EditUsernameDialogController implements Initializable {
 			public void run() {
 //				onError();
 				onSuccess();
+				t.cancel();
 			}
 		}, 1000);
 	}