diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index 9435e9b0d6..15c6dcfecb 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -224,7 +224,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain
             {
                 if (filename.EndsWith(loader.Key))
                 {
-                    loader.Value.LoadFile(filename);
+                    lock (m_scene)
+                    {
+                        ITerrainChannel channel = loader.Value.LoadFile(filename);
+                        m_scene.Heightmap = channel;
+                        m_channel = channel;
+                    }
                     return;
                 }
             }