diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index a4bf5da8a..7869a48eb 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -448,7 +448,7 @@ static bool testBlackboxConditionUncached(FlightLogFieldCondition condition)
 #endif
 
     case FLIGHT_LOG_FIELD_CONDITION_RSSI:
-        return rxConfig()->rssi_channel > 0 || featureIsEnabled(FEATURE_RSSI_ADC);
+        return isRssiConfigured();
 
     case FLIGHT_LOG_FIELD_CONDITION_NOT_LOGGING_EVERY_FRAME:
         return blackboxConfig()->p_ratio != 1;
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 1319ce8cc..d4c8e29ea 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -697,3 +697,8 @@ uint16_t rxGetRefreshRate(void)
 {
     return rxRuntimeConfig.rxRefreshRate;
 }
+
+bool isRssiConfigured(void)
+{
+    return rssiSource != RSSI_SOURCE_NONE;
+}
diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h
index a6d1c378d..92b4a6108 100644
--- a/src/main/rx/rx.h
+++ b/src/main/rx/rx.h
@@ -166,6 +166,7 @@ void setRssiMsp(uint8_t newMspRssi);
 void updateRSSI(timeUs_t currentTimeUs);
 uint16_t getRssi(void);
 uint8_t getRssiPercent(void);
+bool isRssiConfigured(void);
 
 void resetAllRxChannelRangeConfigurations(rxChannelRangeConfig_t *rxChannelRangeConfig);