diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc b/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
index 2f3c0ead58131e56dba7aa6c2c84cc350de7af65..1853ca611f4bf8e350817355a412c1580bf7b446 100644
--- a/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
+++ b/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
@@ -77,6 +77,11 @@ APMSensorsComponentController::APMSensorsComponentController(void) :
     connect(_sensorsComponent, &VehicleComponent::setupCompleteChanged, this, &APMSensorsComponentController::setupNeededChanged);
 }
 
+APMSensorsComponentController::~APMSensorsComponentController()
+{
+    _vehicle->setConnectionLostEnabled(true);
+}
+
 /// Appends the specified text to the status log area in the ui
 void APMSensorsComponentController::_appendStatusLog(const QString& text)
 {
@@ -143,6 +148,10 @@ void APMSensorsComponentController::_resetInternalState(void)
 
 void APMSensorsComponentController::_stopCalibration(APMSensorsComponentController::StopCalibrationCode code)
 {
+    if (_accelCalInProgress) {
+        _vehicle->setConnectionLostEnabled(true);
+    }
+
     disconnect(_uas, &UASInterface::textMessageReceived, this, &APMSensorsComponentController::_handleUASTextMessage);
     
     _compassButton->setEnabled(true);
@@ -193,6 +202,7 @@ void APMSensorsComponentController::calibrateCompass(void)
 
 void APMSensorsComponentController::calibrateAccel(void)
 {
+    _vehicle->setConnectionLostEnabled(false);
     _startLogCalibration();
     _accelCalInProgress = true;
     _uas->startCalibration(UASInterface::StartCalibrationAccel);
diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentController.h b/src/AutoPilotPlugins/APM/APMSensorsComponentController.h
index 61758fc10da03a0b178524474cf0bb23f5e7b5d2..dabdba5239ab58fa3a8e985f7fea4e128ae06a52 100644
--- a/src/AutoPilotPlugins/APM/APMSensorsComponentController.h
+++ b/src/AutoPilotPlugins/APM/APMSensorsComponentController.h
@@ -41,7 +41,8 @@ class APMSensorsComponentController : public FactPanelController
     
 public:
     APMSensorsComponentController(void);
-    
+    ~APMSensorsComponentController();
+
     Q_PROPERTY(bool fixedWing READ fixedWing CONSTANT)
     
     Q_PROPERTY(QQuickItem* statusLog MEMBER _statusLog)