diff --git a/firmware/Gravity/channel.h b/firmware/Gravity/channel.h
index 2079ffb..3baecec 100644
--- a/firmware/Gravity/channel.h
+++ b/firmware/Gravity/channel.h
@@ -86,26 +86,21 @@ class Channel {
 
     void setClockMod(int index) {
         base_clock_mod_index = constrain(index, 0, MOD_CHOICE_SIZE - 1);
-        _recalculatePulses();
     }
 
     void setProbability(int prob) {
         base_probability = constrain(prob, 0, 100);
-        _recalculatePulses();
     }
 
     void setDutyCycle(int duty) {
         base_duty_cycle = constrain(duty, 1, 99);
-        _recalculatePulses();
     }
 
     void setOffset(int off) {
         base_offset = constrain(off, 0, 99);
-        _recalculatePulses();
     }
     void setSwing(int val) {
         base_swing = constrain(val, 50, 95);
-        _recalculatePulses();
     }
 
     // Euclidean
@@ -189,6 +184,8 @@ class Channel {
             return;
         }
 
+        if (isCvModActive()) _recalculatePulses();
+
         int cv1 = gravity.cv1.Read();
         int cv2 = gravity.cv2.Read();
         int cvmod_clock_mod_index = getClockModIndexWithMod(cv1, cv2);