diff --git a/interface/src/MetavoxelSystem.cpp b/interface/src/MetavoxelSystem.cpp
index 89cb4e12bc..85287d03b5 100644
--- a/interface/src/MetavoxelSystem.cpp
+++ b/interface/src/MetavoxelSystem.cpp
@@ -880,22 +880,24 @@ void HeightfieldBuffer::render(bool cursor) {
             DefaultMetavoxelRendererImplementation::getShadowLightHeightfieldProgram().bind();
             DefaultMetavoxelRendererImplementation::getShadowLightHeightfieldProgram().setUniformValue(
                 DefaultMetavoxelRendererImplementation::getShadowLightHeightScaleLocation(), 1.0f / _heightSize);
-                
+            glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
+            DefaultMetavoxelRendererImplementation::getShadowMapHeightfieldProgram().bind();
+                        
         } else if (Menu::getInstance()->isOptionChecked(MenuOption::CascadedShadows)) {
             DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightfieldProgram().bind();
             DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightfieldProgram().setUniformValue(
                 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightScaleLocation(), 1.0f / _heightSize);
-                
+            glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
+            DefaultMetavoxelRendererImplementation::getCascadedShadowMapHeightfieldProgram().bind();
+                    
         } else {
             DefaultMetavoxelRendererImplementation::getLightHeightfieldProgram().bind();
             DefaultMetavoxelRendererImplementation::getLightHeightfieldProgram().setUniformValue(
-                DefaultMetavoxelRendererImplementation::getBaseHeightScaleLocation(), 1.0f / _heightSize);
+                DefaultMetavoxelRendererImplementation::getLightHeightScaleLocation(), 1.0f / _heightSize);
+            glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
+            DefaultMetavoxelRendererImplementation::getHeightfieldProgram().bind();    
         }
         
-        glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
-    
-        DefaultMetavoxelRendererImplementation::getHeightfieldProgram().bind();
-        
         glDisable(GL_POLYGON_OFFSET_FILL);
         glDisable(GL_BLEND);
         glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE);