diff --git a/src/blackmisc/simulation/simulationenvironmentprovider.cpp b/src/blackmisc/simulation/simulationenvironmentprovider.cpp
index ef641334c..944ddb0da 100644
--- a/src/blackmisc/simulation/simulationenvironmentprovider.cpp
+++ b/src/blackmisc/simulation/simulationenvironmentprovider.cpp
@@ -79,7 +79,8 @@ namespace BlackMisc
 
         CElevationPlane ISimulationEnvironmentProvider::findClosestElevationWithinRange(const ICoordinateGeodetic &reference, const PhysicalQuantities::CLength &range) const
         {
-            return this->getElevationCoordinates().findClosestWithinRange(reference, range);
+            const CLength r = range < CElevationPlane::singlePointRadius() ? CElevationPlane::singlePointRadius() : range;
+            return this->getElevationCoordinates().findClosestWithinRange(reference, r);
         }
 
         CSimulatorPluginInfo ISimulationEnvironmentProvider::getSimulatorPluginInfo() const