diff --git a/src/MissionManager/PlanMasterController.cc b/src/MissionManager/PlanMasterController.cc
index 5f788998af9432b67c6aa795faac1d1167dbdae3..8d96d2cca8a3951ea56a0bb6da75db030005f8c5 100644
--- a/src/MissionManager/PlanMasterController.cc
+++ b/src/MissionManager/PlanMasterController.cc
@@ -416,6 +416,11 @@ void PlanMasterController::removeAll(void)
     _missionController.removeAll();
     _geoFenceController.removeAll();
     _rallyPointController.removeAll();
+    if (_offline) {
+        _missionController.setDirty(false);
+        _geoFenceController.setDirty(false);
+        _rallyPointController.setDirty(false);
+    }
 }
 
 void PlanMasterController::removeAllFromVehicle(void)
diff --git a/src/ui/QGCMapRCToParamDialog.cpp b/src/ui/QGCMapRCToParamDialog.cpp
index 309681c8cc6f105f980aaa49a8a63cd5d5d1d83d..61291b738d56a6603e79e63ac021b716cfde813c 100644
--- a/src/ui/QGCMapRCToParamDialog.cpp
+++ b/src/ui/QGCMapRCToParamDialog.cpp
@@ -43,7 +43,7 @@ QGCMapRCToParamDialog::QGCMapRCToParamDialog(QString param_id, UASInterface *mav
 
     ui->paramIdLabel->setText(param_id);
 
-    connect(paramFact, &Fact::valueChanged, this, &QGCMapRCToParamDialog::_parameterUpdated);
+    connect(paramFact, &Fact::vehicleUpdated, this, &QGCMapRCToParamDialog::_parameterUpdated);
     vehicle->parameterManager()->refreshParameter(FactSystem::defaultComponentId, param_id);
 }