diff --git a/binaries/data/mods/public/simulation/components/Trader.js b/binaries/data/mods/public/simulation/components/Trader.js
index f61f233d8f..36e469ee11 100644
--- a/binaries/data/mods/public/simulation/components/Trader.js
+++ b/binaries/data/mods/public/simulation/components/Trader.js
@@ -15,9 +15,6 @@ Trader.prototype.Schema =
 		"<MaxDistance>2.0</MaxDistance>" +
 		"<GainMultiplier>1.0</GainMultiplier>" +
 	"</a:example>" +
-	"<element name='MaxDistance' a:help='Max distance from market when performing deal'>" +
-		"<ref name='positiveDecimal'/>" +
-	"</element>" +
 	"<element name='GainMultiplier' a:help='Additional gain multiplier'>" +
 		"<ref name='positiveDecimal'/>" +
 	"</element>";
@@ -267,7 +264,11 @@ Trader.prototype.StopTrading = function()
 // to be able to trade with it.
 Trader.prototype.GetRange = function()
 {
-	return { "min": 0, "max": +this.template.MaxDistance };
+	var cmpObstruction = Engine.QueryInterface(this.entity, IID_Obstruction);
+	var max = 1;
+	if (cmpObstruction)
+		max += cmpObstruction.GetUnitRadius()*1.5;
+	return { "min": 0, "max": max};
 };
 
 Trader.prototype.OnGarrisonedUnitsChanged = function()
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
index e628dc0581..3765281134 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
@@ -46,7 +46,6 @@ Trade between docks. Garrison a Trader aboard for additional profit (+20% for ea
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <Trader>
-    <MaxDistance>10.0</MaxDistance>
     <GainMultiplier>1.0</GainMultiplier>
   </Trader>
   <UnitAI>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
index 65e1706d5a..ed1c476cdd 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -38,7 +38,6 @@ Trade resources between your own markets and those of your allies.</Tooltip>
     </SoundGroups>
   </Sound>
   <Trader>
-    <MaxDistance>2.0</MaxDistance>
     <GainMultiplier>1.0</GainMultiplier>
   </Trader>
   <UnitAI>