diff --git a/src/js/tribe.js b/src/js/tribe.js
index 7eb89ba6c..9a1eed023 100644
--- a/src/js/tribe.js
+++ b/src/js/tribe.js
@@ -673,8 +673,6 @@ MP.socket.on("disconnect", (f) => {
   MP.room = undefined;
   Notifications.add("Disconnected from Tribe", 0);
   mp_resetLobby();
-  mp_changeActiveSubpage("preloader");
-  mp_resetLobby();
   mp_resetRace();
   mp_changeActiveSubpage("preloader");
   // $(".pageTribe .preloader div").removeClass("hidden");
@@ -758,6 +756,8 @@ MP.socket.on("mp_room_leave", () => {
   MP.name.replace(/\(\d\)$/g, "");
   mp_resetLobby();
   mp_changeActiveSubpage("prelobby");
+  mp_resetLobby();
+  mp_resetRace();
   // swapElements($(".pageTribe .lobby"), $(".pageTribe .prelobby"), 250);
 });
 
@@ -1238,7 +1238,9 @@ $(".pageTribe .prelobby #joinByCode input").keyup((e) => {
   }, 0);
 });
 
-$(".pageTribe .lobby .lobbyButtons .leaveRoomButton").click((e) => {
+$(
+  ".pageTribe .lobby .lobbyButtons .leaveRoomButton, .pageTest #result .resultMpButtons .leaveRoomButton"
+).click((e) => {
   MP.socket.emit("mp_room_leave");
 });
 
diff --git a/src/sass/style.scss b/src/sass/style.scss
index 2871cd635..a1d8d927e 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -1570,8 +1570,12 @@ key {
     display: grid;
     gap: 1rem;
     grid-area: tribe;
-    .timer {
-      text-align: center;
+    .timerAndButtons {
+      display: grid;
+      grid-template-columns: 3fr 1fr;
+      .timer {
+        text-align: center;
+      }
     }
     table {
       thead {
diff --git a/static/index.html b/static/index.html
index d4b90c3d1..602648003 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1249,7 +1249,15 @@
             </div>
             <div id="result" class="hidden">
               <div class="tribeResult hidden">
-                <div class="timer" style="opacity: 0">Timer</div>
+                <div class="timerAndButtons">
+                  <div class="timer" style="opacity: 0">Timer</div>
+                  <div class="resultMpButtons">
+                    <div class="button leaveRoomButton">
+                      <i class="fas fa-door-open"></i>
+                      Leave room
+                    </div>
+                  </div>
+                </div>
                 <table>
                   <thead>
                     <tr>