diff --git a/stretch_core/nodes/stretch_driver b/stretch_core/nodes/stretch_driver
index 151ceedd..23751e38 100755
--- a/stretch_core/nodes/stretch_driver
+++ b/stretch_core/nodes/stretch_driver
@@ -583,7 +583,8 @@ class StretchDriverNode:
             # odometry, and publish joint states
             while not rospy.is_shutdown():
                 self.robot.non_dxl_thread.step()
-                self.robot.pimu.set_fan_on()
+                if self.robot.pimu.params.get('ros_fan_on', True):
+                    self.robot.pimu.set_fan_on()
                 self.command_mobile_base_velocity_and_publish_state()
                 self.robot.push_command()
                 self.dirty_command=False