diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index c6e46c00ee..73ae26a0bf 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -204,6 +204,8 @@ public class Renderer implements ApplicationListener{
             blocks.floor.endDraw();
         });
 
+        Draw.drawRange(Layer.blockBuilding, () -> Draw.shader(Shaders.blockbuild, false), () -> Draw.shader());
+
         if(state.rules.lighting){
             Draw.draw(Layer.light, lights::draw);
         }
diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java
index aeb7704c61..64352eb073 100644
--- a/core/src/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/mindustry/world/blocks/BuildBlock.java
@@ -181,19 +181,18 @@ public class BuildBlock extends Block{
             }
 
             Draw.draw(Layer.blockBuilding, () -> {
-                Draw.shader(Shaders.blockbuild);
                 Shaders.blockbuild.color = Pal.accent;
 
                 Block target = cblock == null ? previous : cblock;
 
-                if(target == null) return;
+                if(target != null){
+                    for(TextureRegion region : target.getGeneratedIcons()){
+                        Shaders.blockbuild.region = region;
+                        Shaders.blockbuild.progress = progress;
 
-                for(TextureRegion region : target.getGeneratedIcons()){
-                    Shaders.blockbuild.region = region;
-                    Shaders.blockbuild.progress = progress;
-
-                    Draw.rect(region, x, y, target.rotate ? tile.rotation() * 90 : 0);
-                    Draw.flush();
+                        Draw.rect(region, x, y, target.rotate ? tile.rotation() * 90 : 0);
+                        Draw.flush();
+                    }
                 }
             });
         }