diff --git a/revolution/miscellaneous.py b/revolution/miscellaneous.py
index a5f405f..40e9668 100644
--- a/revolution/miscellaneous.py
+++ b/revolution/miscellaneous.py
@@ -79,8 +79,14 @@ def update_pwm(pwm: PWM, previous_input: bool, input: bool) -> None:
                     .peripheries
                     .miscellaneous_left_indicator_light_pwm
                 ),
-                previous_left_indicator_light_status_input,
-                left_indicator_light_status_input,
+                (
+                    previous_left_indicator_light_status_input
+                    or previous_hazard_lights_status_input
+                ),
+                (
+                    left_indicator_light_status_input
+                    or hazard_lights_status_input
+                ),
             )
 
             update_pwm(
@@ -90,8 +96,14 @@ def update_pwm(pwm: PWM, previous_input: bool, input: bool) -> None:
                     .peripheries
                     .miscellaneous_right_indicator_light_pwm
                 ),
-                previous_right_indicator_light_status_input,
-                right_indicator_light_status_input,
+                (
+                    previous_right_indicator_light_status_input
+                    or previous_hazard_lights_status_input
+                ),
+                (
+                    right_indicator_light_status_input
+                    or hazard_lights_status_input
+                ),
             )
 
             update_pwm(
@@ -101,8 +113,16 @@ def update_pwm(pwm: PWM, previous_input: bool, input: bool) -> None:
                     .peripheries
                     .miscellaneous_indicator_lights_pwm
                 ),
-                previous_hazard_lights_status_input,
-                hazard_lights_status_input,
+                (
+                    previous_hazard_lights_status_input
+                    or previous_left_indicator_light_status_input
+                    or previous_right_indicator_light_status_input
+                ),
+                (
+                    hazard_lights_status_input
+                    or left_indicator_light_status_input
+                    or right_indicator_light_status_input
+                ),
             )
 
             update_pwm(