diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 4219254aa4..9302784173 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -518,6 +518,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// </returns>
         private bool IsWithinMaxTeleportDistance(RegionInfo sourceRegion, GridRegion destRegion)
         {
+            if(MaxTransferDistance == 0)
+                return true;
+
 //                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Source co-ords are x={0} y={1}", curRegionX, curRegionY);
 //
 //                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final dest is x={0} y={1} {2}@{3}",
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0a85085872..17f7490a3c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -653,7 +653,8 @@
 
 [EntityTransfer]
     ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
-    ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
+    ; This is set to 4095 by default because viewers released before September 2013 can't handle teleports that are greater than this distance
+    ; Setting to 0 will allow teleports of any distance
     max_distance = 4095
 
     ; Minimum user level required for HyperGrid teleports