diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index b968a094a3..cccd2bec0c 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -1556,7 +1556,9 @@ int commander_thread_main(int argc, char *argv[])
 					_usb_telemetry_active = true;
 				}
 
-				telemetry_last_heartbeat[i] = telemetry.heartbeat_time;
+				if (telemetry.heartbeat_time > 0) {
+					telemetry_last_heartbeat[i] = telemetry.heartbeat_time;
+				}
 			}
 		}