diff --git a/src/uClock.cpp b/src/uClock.cpp
index ad152e2..7923b9d 100755
--- a/src/uClock.cpp
+++ b/src/uClock.cpp
@@ -254,7 +254,7 @@ float uClockClass::getTempo()
             acc += ext_interval_buffer[i];
         }
         if (acc != 0) {
-            return freqToBpm(acc / ext_interval_buffer_size);
+            return constrainBpm(freqToBpm(acc / ext_interval_buffer_size));
         }
     }
     return tempo;
@@ -275,6 +275,11 @@ float inline uClockClass::freqToBpm(uint32_t freq)
     return (float)((float)(usecs/(float)input_ppqn) * 60.0);
 }
 
+float inline uClockClass::constrainBpm(float bpm)
+{
+    return (bpm < MIN_BPM) ? MIN_BPM : ( bpm > MAX_BPM ? MAX_BPM : bpm );
+}
+
 void uClockClass::setClockMode(ClockMode tempo_mode)
 {
     clock_mode = tempo_mode;
@@ -492,12 +497,10 @@ void uClockClass::handleTimerInt()
             }
 
             // update internal clock timer frequency
-            float bpm = freqToBpm(counter);
+            float bpm = constrainBpm(freqToBpm(counter));
             if (bpm != tempo) {
-                if (bpm >= MIN_BPM && bpm <= MAX_BPM) {
-                    tempo = bpm;
-                    setTimerTempo(bpm);
-                }
+                tempo = bpm;
+                setTimerTempo(bpm);
             }
         }
 
diff --git a/src/uClock.h b/src/uClock.h
index 468cf1d..b4fafaf 100755
--- a/src/uClock.h
+++ b/src/uClock.h
@@ -184,6 +184,7 @@ class uClockClass {
 
     private:
         float inline freqToBpm(uint32_t freq);
+        float inline constrainBpm(float bpm);
         void calculateReferencedata();
 
         // shuffle