diff --git a/src/QmlControls/PIDTuning.qml b/src/QmlControls/PIDTuning.qml
index b691a0698d57aceadc140ed9d41a059bec69a5d9..781c3e076dabf1c51bba3e59b6ca01dec3774675 100644
--- a/src/QmlControls/PIDTuning.qml
+++ b/src/QmlControls/PIDTuning.qml
@@ -142,16 +142,11 @@ RowLayout {
     }
 
     Component.onCompleted: {
-        // Stop deferring updates to vehicle values. We need them as fast as we can for charting.
-        _activeVehicle.setLiveUpdates(true)
-        _activeVehicle.setpoint.setLiveUpdates(true)
+        _activeVehicle.setPIDTuningTelemetryMode(true)
         saveTuningParamValues()
     }
 
-    Component.onDestruction: {
-        _activeVehicle.setLiveUpdates(false)
-        _activeVehicle.setpoint.setLiveUpdates(true)
-    }
+    Component.onDestruction: _activeVehicle.setPIDTuningTelemetryMode(true)
 
     on_CurrentTuneTypeChanged: {
         saveTuningParamValues()