diff --git a/index.html b/index.html
index b1f825ae2..f5861d94e 100644
--- a/index.html
+++ b/index.html
@@ -189,11 +189,6 @@
           inline
           class="hidden w-full h-full page-content"
         ></territory-patterns-modal>
-        <matchmaking-modal
-          id="page-matchmaking"
-          inline
-          class="hidden w-full h-full page-content"
-        ></matchmaking-modal>
         <user-setting
           id="page-settings"
           inline
diff --git a/src/client/Matchmaking.ts b/src/client/Matchmaking.ts
index 0c4b634f0..e495ef131 100644
--- a/src/client/Matchmaking.ts
+++ b/src/client/Matchmaking.ts
@@ -263,39 +263,35 @@ export class MatchmakingButton extends LitElement {
   }
 
   render() {
-    if (this.isLoggedIn) {
-      return html`
-        <button
-          @click="${this.handleLoggedInClick}"
-          class="no-crazygames w-full h-20 bg-purple-600 hover:bg-purple-500 text-white font-black uppercase tracking-widest rounded-xl transition-all duration-200 flex flex-col items-center justify-center group overflow-hidden relative"
-          title="${translateText("matchmaking_modal.title")}"
-        >
-          <span class="relative z-10 text-2xl">
-            ${translateText("matchmaking_button.play_ranked")}
-          </span>
-          <span
-            class="relative z-10 text-xs font-medium text-purple-100 opacity-90 group-hover:opacity-100 transition-opacity"
+    const button = this.isLoggedIn
+      ? html`
+          <button
+            @click="${this.handleLoggedInClick}"
+            class="no-crazygames w-full h-20 bg-purple-600 hover:bg-purple-500 text-white font-black uppercase tracking-widest rounded-xl transition-all duration-200 flex flex-col items-center justify-center group overflow-hidden relative"
+            title="${translateText("matchmaking_modal.title")}"
           >
-            ${translateText("matchmaking_button.description")}
-          </span>
-        </button>
+            <span class="relative z-10 text-2xl">
+              ${translateText("matchmaking_button.play_ranked")}
+            </span>
+            <span
+              class="relative z-10 text-xs font-medium text-purple-100 opacity-90 group-hover:opacity-100 transition-opacity"
+            >
+              ${translateText("matchmaking_button.description")}
+            </span>
+          </button>
+        `
+      : html`
+          <button
+            @click="${this.handleLoggedOutClick}"
+            class="no-crazygames w-full h-20 bg-purple-600 hover:bg-purple-500 text-white font-black uppercase tracking-widest rounded-xl transition-all duration-200 flex flex-col items-center justify-center overflow-hidden relative cursor-pointer"
+          >
+            <span class="relative z-10 text-2xl">
+              ${translateText("matchmaking_button.login_required")}
+            </span>
+          </button>
+        `;
 
-        <matchmaking-modal></matchmaking-modal>
-      `;
-    }
-
-    return html`
-      <button
-        @click="${this.handleLoggedOutClick}"
-        class="no-crazygames w-full h-20 bg-purple-600 hover:bg-purple-500 text-white font-black uppercase tracking-widest rounded-xl transition-all duration-200 flex flex-col items-center justify-center overflow-hidden relative cursor-pointer"
-      >
-        <span class="relative z-10 text-2xl">
-          ${translateText("matchmaking_button.login_required")}
-        </span>
-      </button>
-
-      <matchmaking-modal></matchmaking-modal>
-    `;
+    return html` ${button} <matchmaking-modal></matchmaking-modal> `;
   }
 
   private handleLoggedInClick() {