diff --git a/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino b/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
index 02fd850..a8d65a5 100644
--- a/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
+++ b/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
@@ -165,7 +165,9 @@ void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) {
       // RED team button
       // ignore button input if in rumble mode
       if (!switchRUMBLE.on()) {
-        buttonREDTEAMvar = receiveDATA.buttonREDTEAM;
+        if (!FightCountDown.isRunning()) {
+          buttonREDTEAMvar = receiveDATA.buttonREDTEAM;
+        }
         buttonREDTEAMtapout = receiveDATA.buttonREDTEAMtapout;
       }
       break;
@@ -173,7 +175,9 @@ void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) {
       // BLUE team button
       // ignore button input if in rumble mode
       if (!switchRUMBLE.on()) {
-        buttonBLUETEAMvar = receiveDATA.buttonBLUETEAM;
+        if (!FightCountDown.isRunning()) {
+          buttonBLUETEAMvar = receiveDATA.buttonBLUETEAM;
+        }
         buttonBLUETEAMtapout = receiveDATA.buttonBLUETEAMtapout;
       }
       break;