diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index c40e1ffc16..164f68e0f1 100644
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -512,7 +512,7 @@ void validateAndFixGyroConfig(void)
 
 bool readEEPROM(void)
 {
-    suspendRxSignal();
+    suspendRxPwmPpmSignal();
 
     // Sanity check, read flash
     bool success = loadEEPROM();
@@ -521,7 +521,7 @@ bool readEEPROM(void)
 
     activateConfig();
 
-    resumeRxSignal();
+    resumeRxPwmPpmSignal();
 
     return success;
 }
@@ -530,11 +530,11 @@ void writeEEPROM(void)
 {
     validateAndFixConfig();
 
-    suspendRxSignal();
+    suspendRxPwmPpmSignal();
 
     writeConfigToEEPROM();
 
-    resumeRxSignal();
+    resumeRxPwmPpmSignal();
 }
 
 void writeEEPROMWithFeatures(uint32_t features)
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index ec0053e423..1614f9d73d 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -322,26 +322,26 @@ bool rxAreFlightChannelsValid(void)
     return rxFlightChannelsValid;
 }
 
-void suspendRxSignal(void)
+void suspendRxPwmPpmSignal(void)
 {
-    suspendRxSignalUntil = micros() + SKIP_RC_ON_SUSPEND_PERIOD;
 #if defined(USE_PWM) || defined(USE_PPM)
     if (featureIsEnabled(FEATURE_RX_PARALLEL_PWM | FEATURE_RX_PPM)) {
+        suspendRxSignalUntil = micros() + SKIP_RC_ON_SUSPEND_PERIOD;
         skipRxSamples = SKIP_RC_SAMPLES_ON_RESUME;
+        failsafeOnRxSuspend(SKIP_RC_ON_SUSPEND_PERIOD);
     }
 #endif
-    failsafeOnRxSuspend(SKIP_RC_ON_SUSPEND_PERIOD);
 }
 
-void resumeRxSignal(void)
+void resumeRxPwmPpmSignal(void)
 {
-    suspendRxSignalUntil = micros();
 #if defined(USE_PWM) || defined(USE_PPM)
     if (featureIsEnabled(FEATURE_RX_PARALLEL_PWM | FEATURE_RX_PPM)) {
+        suspendRxSignalUntil = micros();
         skipRxSamples = SKIP_RC_SAMPLES_ON_RESUME;
+        failsafeOnRxResume();
     }
 #endif
-    failsafeOnRxResume();
 }
 
 bool rxUpdateCheck(timeUs_t currentTimeUs, timeDelta_t currentDeltaTime)
diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h
index 678479e3fa..a6d1c378d4 100644
--- a/src/main/rx/rx.h
+++ b/src/main/rx/rx.h
@@ -169,7 +169,7 @@ uint8_t getRssiPercent(void);
 
 void resetAllRxChannelRangeConfigurations(rxChannelRangeConfig_t *rxChannelRangeConfig);
 
-void suspendRxSignal(void);
-void resumeRxSignal(void);
+void suspendRxPwmPpmSignal(void);
+void resumeRxPwmPpmSignal(void);
 
 uint16_t rxGetRefreshRate(void);