diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp
index ed56f8b61..32ae59342 100755
--- a/radio/src/pulses/pulses.cpp
+++ b/radio/src/pulses/pulses.cpp
@@ -480,6 +480,14 @@ bool setupPulsesInternalModule(uint8_t protocol)
   }
 }
 
+void stopPulsesInternalModule()
+{
+  if (moduleState[INTERNAL_MODULE].protocol != PROTOCOL_CHANNELS_UNINITIALIZED) {
+    intmoduleStop();
+    moduleState[INTERNAL_MODULE].protocol = PROTOCOL_CHANNELS_NONE;
+  }
+}
+
 bool setupPulsesInternalModule()
 {
   uint8_t protocol = getRequiredProtocol(INTERNAL_MODULE);
@@ -498,6 +506,14 @@ bool setupPulsesInternalModule()
 }
 #endif
 
+void stopPulsesExternalModule()
+{
+  if (moduleState[EXTERNAL_MODULE].protocol != PROTOCOL_CHANNELS_UNINITIALIZED)) {
+    extmoduleStop();
+    moduleState[EXTERNAL_MODULE].protocol = PROTOCOL_CHANNELS_NONE;
+  }
+}
+
 bool setupPulsesExternalModule()
 {
   uint8_t protocol = getRequiredProtocol(EXTERNAL_MODULE);
diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h
index 84ecee015..c08f8bb88 100644
--- a/radio/src/pulses/pulses.h
+++ b/radio/src/pulses/pulses.h
@@ -315,8 +315,12 @@ extern TrainerPulsesData trainerPulsesData;
 
 #if defined(HARDWARE_INTERNAL_MODULE)
 bool setupPulsesInternalModule();
+void stopPulsesInternalModule();
 #endif
+#if defined(HARDWARE_EXTERNAL_MODULE)
 bool setupPulsesExternalModule();
+void stopPulsesExternalModule();
+#endif
 void setupPulsesDSM2();
 void setupPulsesCrossfire();
 void setupPulsesGhost();
@@ -353,7 +357,9 @@ inline void startPulses()
   setupPulsesInternalModule();
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   setupPulsesExternalModule();
+#endif
 
 #if defined(HARDWARE_EXTRA_MODULE)
   extramodulePpmStart();
diff --git a/radio/src/storage/storage_common.cpp b/radio/src/storage/storage_common.cpp
index 40bac6a67..857cdd1a6 100644
--- a/radio/src/storage/storage_common.cpp
+++ b/radio/src/storage/storage_common.cpp
@@ -53,11 +53,11 @@ void preModelLoad()
   }
   pauseMixerCalculations();
 
-#if defined(INTMODULE_PWR_GPIO)
-  INTERNAL_MODULE_OFF();
+#if defined(HARDWARE_INTERNAL_MODULE)
+  stopPulsesInternalModule();
 #endif
-#if defined(EXTMODULE_PWR_GPIO)
-  EXTERNAL_MODULE_OFF();
+#if defined(HARDWARE_EXTERNAL_MODULE)
+  stopPulsesExternalModule();
 #endif
 
   stopTrainer();