diff --git a/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino b/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
index a8d65a5..18e9401 100644
--- a/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
+++ b/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino
@@ -165,20 +165,28 @@ 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()) {
+        // ignore button press while in fight
         if (!FightCountDown.isRunning()) {
           buttonREDTEAMvar = receiveDATA.buttonREDTEAM;
         }
-        buttonREDTEAMtapout = receiveDATA.buttonREDTEAMtapout;
+        // ignore tapout while not in fight
+        if (FightCountDown.isRunning()) {
+          buttonREDTEAMtapout = receiveDATA.buttonREDTEAMtapout;
+        }
       }
       break;
     case 2:
       // BLUE team button
       // ignore button input if in rumble mode
       if (!switchRUMBLE.on()) {
+        // ignore button press while in fight
         if (!FightCountDown.isRunning()) {
           buttonBLUETEAMvar = receiveDATA.buttonBLUETEAM;
         }
-        buttonBLUETEAMtapout = receiveDATA.buttonBLUETEAMtapout;
+        // ignore tapout while not in fight
+        if (FightCountDown.isRunning()) {
+          buttonBLUETEAMtapout = receiveDATA.buttonBLUETEAMtapout;
+        }
       }
       break;
   }