diff --git a/src/js/script.js b/src/js/script.js
index 8609c9aff..2e3c579ae 100644
--- a/src/js/script.js
+++ b/src/js/script.js
@@ -1882,7 +1882,7 @@ function showResult(difficultyFailed = false, mp_outOfTime = false) {
     $(".pageTest #result .tribeResultChat").removeClass("hidden");
     if (MP.room.isLeader) {
       $(".pageTest #backToLobbyButton").removeClass("hidden");
-      $(".pageTest #nextTestButton").removeClass("hidden");
+      // $(".pageTest #nextTestButton").removeClass("hidden");
       $(".pageTest #readyButton").addClass("hidden");
     }
   } else {
diff --git a/src/js/tribe.js b/src/js/tribe.js
index 884caebd5..512bcfd10 100644
--- a/src/js/tribe.js
+++ b/src/js/tribe.js
@@ -818,7 +818,7 @@ MP.socket.on("mp_room_user_left", (data) => {
     $(".pageTribe .lobby .userReadyButton").addClass("hidden");
     $(".pageTest #result #backToLobbyButton").removeClass("hidden");
     $(".pageTest #result #readyButton").addClass("hidden");
-    $(".pageTest #result #nextTestButton").removeClass("hidden");
+    // $(".pageTest #result #nextTestButton").removeClass("hidden");
   }
   mp_refreshUserList();
 });
@@ -907,6 +907,18 @@ MP.socket.on("mp_room_finishTimer_over", (data) => {
   if (testActive) showResult(undefined, true);
 });
 
+MP.socket.on("mp_room_readyResultTimer_countdown", (data) => {
+  showResultCountdown();
+  updateResultCountdown(`Time left for everyone to get ready: ${data.val}s`);
+});
+
+MP.socket.on("mp_room_readyResultTimer_over", (data) => {
+  hideResultCountdown();
+  if (MP.room.isLeader) {
+    $(".pageTest #nextTestButton").removeClass("hidden");
+  }
+});
+
 MP.socket.on("mp_room_test_init", (data) => {
   mp_refreshTestUserList();
   if (!MP.room.isReady && !MP.room.isLeader) {
@@ -1071,21 +1083,21 @@ MP.socket.on("mp_room_winner", (data) => {
   if (data.official) {
     hideResultCountdown();
     // updateAllGraphs(graphs, data.maxRaw);
-    MP.room.newTestCooldown = true;
-    $("#result #nextTestButton").html(
-      `<i class="fas fa-fw fa-spin fa-circle-notch"></i>`
-    );
-    $("#result #nextTestButton").attr(
-      "aria-label",
-      "Please wait for all players to view their result"
-    );
-    setTimeout(() => {
-      MP.room.newTestCooldown = false;
-      $("#result #nextTestButton").html(
-        `<i class="fas fa-fw fa-chevron-right"></i>`
-      );
-      $("#result #nextTestButton").attr("aria-label", "Next test");
-    }, 5000);
+    // MP.room.newTestCooldown = true;
+    // $("#result #nextTestButton").html(
+    //   `<i class="fas fa-fw fa-spin fa-circle-notch"></i>`
+    // );
+    // $("#result #nextTestButton").attr(
+    //   "aria-label",
+    //   "Please wait for all players to view their result"
+    // );
+    // setTimeout(() => {
+    //   MP.room.newTestCooldown = false;
+    //   $("#result #nextTestButton").html(
+    //     `<i class="fas fa-fw fa-chevron-right"></i>`
+    //   );
+    //   $("#result #nextTestButton").attr("aria-label", "Next test");
+    // }, 5000);
   }
   let userwon = false;
   data.sorted.forEach((sid) => {