diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index f9af60b750..d9e6d52fc1 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -10,9 +10,10 @@
 namespace MWRender
 {
 
-CellBorder::CellBorder(Terrain::World *world, osg::Group *root):
+CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask):
     mWorld(world),
-    mRoot(root)
+    mRoot(root),
+    mBorderMask(borderMask)
 {
 }
 
@@ -68,6 +69,8 @@ void CellBorder::createCellBorderGeometry(int x, int y)
     polygonmode->setMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE);
     stateSet->setAttributeAndModes(polygonmode,osg::StateAttribute::ON);
 
+    borderGeode->setNodeMask(mBorderMask);
+
     mRoot->addChild(borderGeode);
 
     mCellBorderNodes[std::make_pair(x,y)] = borderGeode;
diff --git a/components/terrain/cellborder.hpp b/components/terrain/cellborder.hpp
index a505aec9cf..0cbe7b8993 100644
--- a/components/terrain/cellborder.hpp
+++ b/components/terrain/cellborder.hpp
@@ -19,7 +19,7 @@ namespace MWRender
     public:
         typedef std::map<std::pair<int, int>, osg::ref_ptr<osg::Node> > CellGrid; 
 
-        CellBorder(Terrain::World *world, osg::Group *root);
+        CellBorder(Terrain::World *world, osg::Group *root, int borderMask);
 
         void createCellBorderGeometry(int x, int y);
         void destroyCellBorderGeometry(int x, int y);
@@ -34,6 +34,7 @@ namespace MWRender
         osg::Group *mRoot;
 
         CellGrid mCellBorderNodes;
+        int mBorderMask;
     };
 }
 
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index f0f6285610..cc81dbef8e 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -47,7 +47,7 @@ World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSyst
 
     mTextureManager.reset(new TextureManager(mResourceSystem->getSceneManager()));
     mChunkManager.reset(new ChunkManager(mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer));
-    mCellBorder.reset(new MWRender::CellBorder(this,mTerrainRoot.get()));
+    mCellBorder.reset(new MWRender::CellBorder(this,mTerrainRoot.get(),borderMask));
 
     mResourceSystem->addResourceManager(mChunkManager.get());
     mResourceSystem->addResourceManager(mTextureManager.get());