diff --git a/src/modules/RemoteHardwareModule.cpp b/src/modules/RemoteHardwareModule.cpp
index 419885822..f8f2fecae 100644
--- a/src/modules/RemoteHardwareModule.cpp
+++ b/src/modules/RemoteHardwareModule.cpp
@@ -135,8 +135,7 @@ int32_t RemoteHardwareModule::runOnce()
         }
     } else {
         // No longer watching anything - stop using CPU
-        enabled = false;
-        return INT32_MAX;
+        return disable();
     }
 
     return 200; // Poll our GPIOs every 200ms (FIXME, make adjustable via protobuf arg)
diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
index 00d8df9d2..fc6448a97 100644
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -221,9 +221,7 @@ int32_t SerialModule::runOnce()
         return (10);
     } else {
         DEBUG_MSG("Serial Module Disabled\n");
-
-        enabled = false;
-        return INT32_MAX;
+        return disable();
     }
 }
 
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index 500acd7f7..b2b100257 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -67,8 +67,7 @@ int32_t EnvironmentTelemetryModule::runOnce()
     if (!(moduleConfig.telemetry.environment_measurement_enabled ||
           moduleConfig.telemetry.environment_screen_enabled)) {
         // If this module is not enabled, and the user doesn't want the display screen don't waste any OSThread time on it
-        enabled = false;
-        return result;
+        return disable();
     }
 
     if (firstTime) {
diff --git a/src/modules/esp32/RangeTestModule.cpp b/src/modules/esp32/RangeTestModule.cpp
index 5e52fea40..0aa25946d 100644
--- a/src/modules/esp32/RangeTestModule.cpp
+++ b/src/modules/esp32/RangeTestModule.cpp
@@ -82,8 +82,7 @@ int32_t RangeTestModule::runOnce()
 
                 return (senderHeartbeat);
             } else {
-                enabled = false;
-                return (INT32_MAX);
+                return disable();
                 // This thread does not need to run as a receiver
             }
 
diff --git a/src/modules/esp32/StoreForwardModule.cpp b/src/modules/esp32/StoreForwardModule.cpp
index af0e60ed7..70a28ac68 100644
--- a/src/modules/esp32/StoreForwardModule.cpp
+++ b/src/modules/esp32/StoreForwardModule.cpp
@@ -52,8 +52,7 @@ int32_t StoreForwardModule::runOnce()
         return (this->packetTimeMax);
     }
 #endif
-    enabled = false; // Client doesn't need periodical
-    return (INT32_MAX);
+    return disable();
 }
 
 /*