diff --git a/src/client/Main.ts b/src/client/Main.ts
index 82f5c516a..0d6e5cdae 100644
--- a/src/client/Main.ts
+++ b/src/client/Main.ts
@@ -599,6 +599,9 @@ class Client {
     };
 
     const onJoinChanged = () => {
+      // Always abort any in-progress join attempt, even if gameStop isn't set yet
+      this.joinAttemptId++;
+
       if (this.gameStop !== null) {
         this.handleLeaveLobby();
       }