diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java
index cf4b16ee86..8819f262ec 100644
--- a/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java
+++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java
@@ -170,9 +170,11 @@ public class TournamentSession {
     }
 
     private void removeTournamentForUser() {
-        UserManager.instance.getUser(userId).ifPresent(user
-                -> user.removeTournament(playerId));
-
+        Optional<User> user = UserManager.instance.getUser(userId);
+        if (user.isPresent()) {
+            user.get().removeTable(playerId);
+            user.get().removeTournament(playerId);
+        }
     }
 
 }