diff --git a/frontend/static/js/views/MatchMakingView.js b/frontend/static/js/views/MatchMakingView.js
index ed68d4c..2327053 100644
--- a/frontend/static/js/views/MatchMakingView.js
+++ b/frontend/static/js/views/MatchMakingView.js
@@ -28,14 +28,13 @@ export default class extends AbstractAuthenticatedView {
     ondisconnect(event)
     {
         this.button.innerHTML = lang.get("matchmakingStartSearch");
-        clearIds("innerText", ["detail"]);
     }
 
     onreceive(data)
     {
         if (data.detail === "game_found")
         {
-            if (this.gamemode.value == "pong")
+            if (this.gamemode_input.value == "pong")
                 navigateTo(`/games/${data.gamemode}/${data.game_id}`);
             else
                 navigateTo(`/games/${data.gamemode}/${data.game_id}`);
@@ -90,6 +89,7 @@ export default class extends AbstractAuthenticatedView {
                 nb_players_div.style.display = 'block';
 
             client.matchmaking.stop();
+            clearIds("innerText", ["detail"]);
         });
     }