diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index 1ddd321bf8..42bab8569b 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -972,6 +972,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				// Made Missile terrain height checks disableable and disabled by default
+				if (engineVersion < 20170713)
+				{
+					var gridMaxHeight = modData.Manifest.Get<MapGrid>().MaximumTerrainHeight;
+					if (gridMaxHeight > 0)
+					{
+						var projectile = node.Value.Nodes.FirstOrDefault(n => n.Key == "Projectile");
+						if (projectile != null && projectile.Value.Value == "Missile")
+							projectile.Value.Nodes.Add(new MiniYamlNode("TerrainHeightAware", "true"));
+					}
+				}
+
 				UpgradeWeaponRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}
diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml
index 652a54602e..cc97b2aa21 100644
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -129,6 +129,7 @@ CyCannon:
 		MinimumLaunchSpeed: 75
 		Speed: 384
 		RangeLimit: 8c0
+		TerrainHeightAware: true
 	Warhead@1Dam: SpreadDamage
 		Spread: 43
 		Damage: 120
diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml
index 8a960a267b..82da254a39 100644
--- a/mods/ts/weapons/missiles.yaml
+++ b/mods/ts/weapons/missiles.yaml
@@ -21,6 +21,7 @@
 		VerticalRateOfTurn: 11
 		CruiseAltitude: 2c124
 		AllowSnapping: true
+		TerrainHeightAware: true
 	Warhead@1Dam: SpreadDamage
 		Spread: 108
 		Falloff: 100, 50, 25, 12, 6, 3, 0
diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml
index dfac7d3674..c61cd1d6a0 100644
--- a/mods/ts/weapons/superweapons.yaml
+++ b/mods/ts/weapons/superweapons.yaml
@@ -15,6 +15,7 @@ MultiCluster:
 		Palette: ra
 		MinimumLaunchSpeed: 75
 		Speed: 384
+		TerrainHeightAware: true
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 65