diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
index 37fa441dde..221ec6731b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
@@ -631,8 +631,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         private void addToInner(GridRegion region)
         {
-            int rsx = region.RegionSizeX >> 8;
-            int rsy = region.RegionSizeY >> 8;
+            int rsx = region.RegionSizeX;
+            int rsy = region.RegionSizeY;
+
+            if(rsx < 512 && rsy < 512)
+                return;
+
+            rsx >>= 8;
+            rsy >>= 8;
+
             ulong handle = region.RegionHandle & HANDLEMASH;
             fastRegionHandle fh = new fastRegionHandle(handle);
             uint startY = fh.y;