diff --git a/src/main/java/com/broll/networklib/client/impl/LobbyConnectionSite.java b/src/main/java/com/broll/networklib/client/impl/LobbyConnectionSite.java
index 59cde79..a9b84c9 100644
--- a/src/main/java/com/broll/networklib/client/impl/LobbyConnectionSite.java
+++ b/src/main/java/com/broll/networklib/client/impl/LobbyConnectionSite.java
@@ -58,6 +58,7 @@ public void receive(NT_LobbyKicked kicked) {
         if (lobby != null && lobby.getLobbyUpdateListener() != null) {
             lobby.getLobbyUpdateListener().kickedFromLobby(lobby);
         }
+        LastConnection.clear();
         resetLobby();
     }
 
@@ -67,6 +68,7 @@ public void receive(NT_LobbyClosed closed) {
         if (lobby != null && lobby.getLobbyUpdateListener() != null) {
             lobby.getLobbyUpdateListener().closed(lobby);
         }
+        LastConnection.clear();
         resetLobby();
     }
 
@@ -89,7 +91,6 @@ public void onDisconnect() {
     }
 
     private synchronized void resetLobby() {
-        LastConnection.clear();
         clearLobby.run();
         lobby = null;
     }