diff --git a/app/telemetry/MavlinkTelemetry.cpp b/app/telemetry/MavlinkTelemetry.cpp
index f3c5267d7..c656f5f6c 100644
--- a/app/telemetry/MavlinkTelemetry.cpp
+++ b/app/telemetry/MavlinkTelemetry.cpp
@@ -285,7 +285,7 @@ bool MavlinkTelemetry::change_manual_tcp_ip(QString ip)
 
 void MavlinkTelemetry::send_heartbeat_loop()
 {
-    while(true){
+    while(m_heartbeat_thread_run){
         //qDebug()<<"send_heartbeat_loop";
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
         perform_connection_management();