diff --git a/src/js/tribe.js b/src/js/tribe.js
index 2c8f57f8c..bcd524960 100644
--- a/src/js/tribe.js
+++ b/src/js/tribe.js
@@ -670,23 +670,29 @@ function destroyAllGraphs() {
 }
 
 function mp_userReady() {
-  $(".pageTribe .lobby .lobbyButtons .userReadyButton").addClass("hidden");
-  $(".pageTest #result .resultMpButtons .userReadyButton").addClass("hidden");
-  $(".pageTest #result #readyButton").addClass("hidden");
+  $(".pageTribe .lobby .lobbyButtons .userReadyButton").addClass("disabled");
+  $(".pageTest #result .resultMpButtons .userReadyButton").addClass("disabled");
+  $(".pageTest #result #readyButton").addClass("disabled");
   MP.socket.emit("mp_user_ready");
 }
 
 function mp_resetReadyButtons() {
   if (!MP.room.isLeader && !MP.room.isReady) {
-    $(".pageTribe .lobby .lobbyButtons .userReadyButton").removeClass("hidden");
-    $(".pageTest #result .resultMpButtons .userReadyButton").removeClass(
-      "hidden"
+    $(".pageTribe .lobby .lobbyButtons .userReadyButton").removeClass(
+      "disabled"
     );
-    $(".pageTest #result #readyButton").removeClass("hidden");
+    $(".pageTest #result .resultMpButtons .userReadyButton").removeClass(
+      "disabled"
+    );
+    $(".pageTest #result #readyButton").removeClass("disabled");
   } else {
-    $(".pageTribe .lobby .lobbyButtons .userReadyButton").addClass("hidden");
-    $(".pageTest #result .resultMpButtons .userReadyButton").addClass("hidden");
-    $(".pageTest #result #readyButton").addClass("hidden");
+    let cls = "disabled";
+    if (MP.room.isLeader) {
+      cls = "hidden";
+    }
+    $(".pageTribe .lobby .lobbyButtons .userReadyButton").addClass(cls);
+    $(".pageTest #result .resultMpButtons .userReadyButton").addClass(cls);
+    $(".pageTest #result #readyButton").addClass(cls);
   }
 }
 
diff --git a/src/sass/style.scss b/src/sass/style.scss
index f5969f6d3..29b557d6e 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -1584,10 +1584,15 @@ key {
           &:hover {
             background: var(--text-color);
           }
+          &.disabled {
+            pointer-events: none;
+            opacity: 0.1;
+          }
         }
       }
       .timer {
         text-align: center;
+        align-self: center;
       }
     }
     table {
@@ -2063,6 +2068,11 @@ key {
   }
 }
 
+#readyButton.disabled {
+  pointer-events: none;
+  opacity: 0.1;
+}
+
 #restartTestButton {
   margin: 0 auto;
   margin-top: 1rem;
@@ -3110,6 +3120,10 @@ key {
         &:hover {
           background: var(--text-color);
         }
+        &.disabled {
+          pointer-events: none;
+          opacity: 0.1;
+        }
       }
     }
     .currentSettings {