diff --git a/src/QmlControls/PIDTuning.qml b/src/QmlControls/PIDTuning.qml
index cf0bbe9..a303c69 100644
--- a/src/QmlControls/PIDTuning.qml
+++ b/src/QmlControls/PIDTuning.qml
@@ -307,6 +307,15 @@ RowLayout {
                     }
                 }
             }
+            Connections {
+                target: globals.activeVehicle
+                onArmedChanged: {
+                    if (armed && !dataTimer.running) { // start plotting on arming if not already running
+                        dataTimer.running = true
+                        _last_t = 0
+                    }
+                }
+            }
         }
 
         QGCCheckBox {