diff --git a/src/main/flight/failsafe.c b/src/main/flight/failsafe.c
index 037c424140..acc48a6703 100644
--- a/src/main/flight/failsafe.c
+++ b/src/main/flight/failsafe.c
@@ -165,7 +165,8 @@ void failsafeUpdateState(void)
         return;
     }
 
-    bool receivingRxData = failsafeIsReceivingRxData();
+    //bool receivingRxData = failsafeIsReceivingRxData();        // FIXME - Original check for received data
+    bool receivingRxData = rxIsReceivingSignal() ? true : false; // FIXME - temporary workaround for the original CF failsafe. It works pretty well actuall
     bool armed = ARMING_FLAG(ARMED);
     bool failsafeSwitchIsOn = IS_RC_MODE_ACTIVE(BOXFAILSAFE);
     beeperMode_e beeperMode = BEEPER_SILENCE;