diff --git a/src/MissionManager/MissionSettingsItem.cc b/src/MissionManager/MissionSettingsItem.cc
index 808b4448d2351ada31d25bfa6a5c5ad8f3f987fd..24418695a8de74ff0a58c1b2560a339d3801a5b9 100644
--- a/src/MissionManager/MissionSettingsItem.cc
+++ b/src/MissionManager/MissionSettingsItem.cc
@@ -297,6 +297,11 @@ void MissionSettingsItem::setMissionEndRTL(bool missionEndRTL)
 void MissionSettingsItem::_setHomeAltFromTerrain(double terrainAltitude)
 {
     if (!_plannedHomePositionFromVehicle) {
+		// We need to stop this from signalling, Otherwise the dirty but get set on a delay
+		// which then marks the Plan view as incorrectly dirty
+        _plannedHomePositionAltitudeFact.setSendValueChangedSignals(false);
         _plannedHomePositionAltitudeFact.setRawValue(terrainAltitude);
+        _plannedHomePositionAltitudeFact.clearDeferredValueChangeSignal();
+        _plannedHomePositionAltitudeFact.setSendValueChangedSignals(false);
     }
 }