diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp
index 8ea9e42d1..d073a8674 100644
--- a/radio/src/logs.cpp
+++ b/radio/src/logs.cpp
@@ -152,9 +152,7 @@ void writeHeader()
 #endif
 
 #if defined(FRSKY)
-#if defined(CPUARM)
-  f_puts("SWR,RSSI,", &g_oLogFile);
-#else
+#if !defined(CPUARM)
   f_puts("Buffer,RX,TX,A1,A2,", &g_oLogFile);
 #if defined(FRSKY_HUB)
   if (IS_USR_PROTO_FRSKY_HUB()) {
@@ -232,11 +230,7 @@ void writeLogs()
 #endif
 
 #if defined(FRSKY)
-#if defined(CPUARM)
-      f_printf(&g_oLogFile, "%d,%d,", RAW_FRSKY_MINMAX(frskyData.swr), RAW_FRSKY_MINMAX(frskyData.rssi));
-#elif defined(CPUARM)
-      f_printf(&g_oLogFile, "%d,", RAW_FRSKY_MINMAX(frskyData.rssi));
-#else
+#if !defined(CPUARM)
       f_printf(&g_oLogFile, "%d,%d,%d,", frskyStreaming, RAW_FRSKY_MINMAX(frskyData.rssi[0]), RAW_FRSKY_MINMAX(frskyData.rssi[1]));
       for (uint8_t i=0; i<MAX_FRSKY_A_CHANNELS; i++) {
         int16_t converted_value = applyChannelRatio(i, RAW_FRSKY_MINMAX(frskyData.analog[i]));
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index fd2d5b57a..6fe24f7f0 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -254,7 +254,10 @@ void frskySportSetDefault(int index, uint16_t id, uint8_t instance)
     TelemetryUnit unit = sensor->unit;
     uint8_t prec = min<uint8_t>(2, sensor->prec);
     telemetrySensor.init(sensor->name, unit, prec);
-    if (id >= ADC1_ID && id <= BATT_ID) {
+    if (id == RSSI_ID) {
+      telemetrySensor.logs = true;
+    }
+    else if (id >= ADC1_ID && id <= BATT_ID) {
       telemetrySensor.custom.ratio = 132;
       telemetrySensor.filter = 1;
     }