diff --git a/software/GToE/GToE.ino b/software/GToE/GToE.ino
index c5e9582..a78f12c 100644
--- a/software/GToE/GToE.ino
+++ b/software/GToE/GToE.ino
@@ -145,7 +145,7 @@ void loop() {
     display.clearDisplay();
     display.display();
   }
-  if (masterClockMode == 2 || bpmModulationRange != 0) {
+  if (masterClockMode == 2) {
     calculateBPMTiming();
   }
 }
@@ -168,7 +168,10 @@ void clock() {
           pulseCount++;
         } else {
           pulseCount = 0;
-        } 
+        }
+        if (bpmModulationRange != 0) {
+          calculateBPMTiming();
+        }
       }
     }