diff --git a/g2core/canonical_machine.cpp b/g2core/canonical_machine.cpp
index ab26d1b80..61f630851 100644
--- a/g2core/canonical_machine.cpp
+++ b/g2core/canonical_machine.cpp
@@ -1370,6 +1370,14 @@ stat_t cm_change_tool(const uint8_t tool_change)
     return (STAT_OK);
 }
 
+bool cm_is_laser_tool(void)
+{
+    // Tool 32 is always a laser.  Later we can use a different qualifier,
+    // possibly a new field in the tool db which indicates tool type.
+    return (32 == cm->gm.tool_select);
+}
+
+
 /****************************************************************************************
  **** Miscellaneous Functions (4.3.9) ***************************************************
  ****************************************************************************************/
diff --git a/g2core/canonical_machine.h b/g2core/canonical_machine.h
index d37579eb0..0e56b5b06 100644
--- a/g2core/canonical_machine.h
+++ b/g2core/canonical_machine.h
@@ -463,6 +463,8 @@ stat_t cm_arc_feed(const float target[], const bool target_f[],             // G
 stat_t cm_select_tool(const uint8_t tool);                      // T parameter
 stat_t cm_change_tool(const uint8_t tool);                      // M6
 
+bool cm_is_laser_tool(void);                                    // True if tool is a laser
+
 // Miscellaneous Functions (4.3.9)
 // see coolant.h for coolant functions - which would go right here
 
diff --git a/g2core/plan_exec.cpp b/g2core/plan_exec.cpp
index 9e78ac854..5aaa495d3 100644
--- a/g2core/plan_exec.cpp
+++ b/g2core/plan_exec.cpp
@@ -917,6 +917,10 @@ static stat_t _exec_aline_segment()
         }
     }
 
+    if (cm_is_laser_tool() && spindle.direction == SPINDLE_CCW) {
+        spindle_update_laser_override(mr->segment_velocity);
+    }
+
     // Convert target position to steps
     // Bucket-brigade the old target down the chain before getting the new target from kinematics
     //
diff --git a/g2core/spindle.cpp b/g2core/spindle.cpp
index 2880a0caa..4e5912804 100644
--- a/g2core/spindle.cpp
+++ b/g2core/spindle.cpp
@@ -180,6 +180,11 @@ static void _exec_spindle_control(float *value, bool *flag)
             spindle.direction = control;
             spindle.state = control;
             spinup_delay = true;
+            if (cm_is_laser_tool() && spindle.direction == SPINDLE_CCW) {
+                // Since dynamic laser mode relies on spindle override to scale
+                // the power, ensure it is initialize when transitioning into this state.
+                spindle.override_factor = 0.0;
+            }
             break; 
         }
         case SPINDLE_PAUSE : { 
@@ -215,7 +220,7 @@ static void _exec_spindle_control(float *value, bool *flag)
     }
     pwm_set_duty(PWM_1, _get_spindle_pwm(spindle, pwm));
 
-    if (spinup_delay) {
+    if (spinup_delay && !cm_is_laser_tool()) {
         mp_request_out_of_band_dwell(spindle.spinup_delay);
     }
 }
@@ -261,7 +266,7 @@ static void _exec_spindle_speed(float *value, bool *flag)
     spindle.speed = value[0];
     pwm_set_duty(PWM_1, _get_spindle_pwm(spindle, pwm));
 
-    if (fp_ZERO(previous_speed)) {
+    if (fp_ZERO(previous_speed) && !cm_is_laser_tool()) {
         mp_request_out_of_band_dwell(spindle.spinup_delay);
     }
 }
@@ -318,6 +323,12 @@ static float _get_spindle_pwm (spSpindle_t &_spindle, pwmControl_t &_pwm)
         }
         // normalize speed to [0..1]
         float speed = (_spindle.speed - speed_lo) / (speed_hi - speed_lo);
+        if (cm_is_laser_tool() && spindle.direction == SPINDLE_CCW) {
+            // We are in dynamic laser mode (M4) + Laser tool.  Adjust
+            // speed based on override_factor which is updated based on
+            // current velocity.
+            speed *= spindle.override_factor;
+        }
         return ((speed * (phase_hi - phase_lo)) + phase_lo);
     } else {
         return (_pwm.c[PWM_1].phase_off);
@@ -369,6 +380,20 @@ void spindle_end_override(const float ramp_time)
     return;
 }
 
+// Called in ISR so be careful and fast
+void spindle_update_laser_override(float current_velocity) {
+    float spindle_override = 0.0;
+    float feed_rate = cm_get_feed_rate(ACTIVE_MODEL);
+
+    if (feed_rate > 0.0) {
+        spindle_override = current_velocity / feed_rate;
+        if (spindle_override > 1.0) spindle_override = 1.0;
+        else if (spindle_override < 0.0) spindle_override = 0.0; 
+    }
+    spindle.override_factor = spindle_override;
+    pwm_set_duty(PWM_1, _get_spindle_pwm(spindle, pwm));
+}
+
 /****************************
  * END OF SPINDLE FUNCTIONS *
  ****************************/
diff --git a/g2core/spindle.h b/g2core/spindle.h
index 2b6f21ed6..d0d37cd17 100644
--- a/g2core/spindle.h
+++ b/g2core/spindle.h
@@ -120,6 +120,7 @@ stat_t spindle_speed_sync(float speed);         // S parameter
 stat_t spindle_override_control(const float P_word, const bool P_flag); // M51
 void spindle_start_override(const float ramp_time, const float override_factor);
 void spindle_end_override(const float ramp_time);
+void spindle_update_laser_override(float current_velocity);
 
 stat_t sp_get_spmo(nvObj_t *nv);
 stat_t sp_set_spmo(nvObj_t *nv);