diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index daa3afaf1..5703d7625 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -176,7 +176,8 @@ void sportProcessTelemetryPacketWithoutCrc(uint8_t origin, const uint8_t * packe
       if (data > 0) {
         telemetryStreaming = TELEMETRY_TIMEOUT10ms; // reset counter only if valid packets are being detected
         telemetryData.telemetryValid |= originMask;
-      } else {
+      }
+      else {
         telemetryData.telemetryValid &= ~originMask;
       }
       if (g_model.rssiSource) {
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 5c33b811b..c60507c46 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -223,21 +223,23 @@ void telemetryInterrupt10ms()
 #if !defined(SIMU)
     telemetryData.rssi.reset();
 #endif
-    for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
-      telemetryItems[i].setOld();
+    for (auto & telemetryItem: telemetryItems) {
+      if (telemetryItem.isAvailable()) {
+        telemetryItem.setOld();
+      }
     }
   }
 }
 
 void telemetryReset()
 {
-  memclear(&telemetryData, sizeof(telemetryData));
+  telemetryData.clear();
 
   for (auto & telemetryItem : telemetryItems) {
     telemetryItem.clear();
   }
 
-  telemetryStreaming = 0; // reset counter only if valid frsky packets are being detected
+  telemetryStreaming = 0; // reset counter only if valid telemetry packets are being detected
 
   telemetryState = TELEMETRY_INIT;
 }