diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index c2d212f8a5..0282eb8de1 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -498,9 +498,8 @@ void QuadTreeWorld::enable(bool enabled)
         if (!mRootNode->getNumParents())
             mTerrainRoot->addChild(mRootNode);
     }
-
-    if (mRootNode)
-        mRootNode->setNodeMask(enabled ? ~0 : 0);
+    else if (mRootNode)
+        mTerrainRoot->removeChild(mRootNode);
 }
 
 View* QuadTreeWorld::createView()