diff --git a/Client/src/main/java/de/com/baseband/client/feature/modules/render/ESP.java b/Client/src/main/java/de/com/baseband/client/feature/modules/render/ESP.java
index d1c01a7..4f9cb49 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/modules/render/ESP.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/modules/render/ESP.java
@@ -10,6 +10,7 @@ import de.com.baseband.client.registry.annotation.Range;
 import de.com.baseband.client.util.adapt.Marker;
 import de.com.baseband.client.util.render.Pixels;
 import de.com.baseband.client.util.render.RenderAdapter;
+import net.minecraft.block.BlockAir;
 import net.minecraft.entity.Entity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -33,8 +34,13 @@ public class ESP extends Feature {
     }
 
     @Config("Highlight")
+    @Marker(0)
     public boolean highlight;
 
+    @Config("Highlight Air")
+    @Gate(0)
+    public boolean hightlightAir;
+
     @Config("Entities")
     public boolean entities;
 
@@ -108,7 +114,9 @@ public class ESP extends Feature {
 
         if(highlight) {
             BlockPos pos = mc.objectMouseOver.getBlockPos();
-            RenderAdapter.drawAABBNow(mc.world.getBlockState(pos).getBoundingBox(mc.world, pos).offset(pos));
+            if(!(mc.world.getBlockState(pos).getBlock() instanceof BlockAir) || !hightlightAir) {
+                renderer.accept(mc.world.getBlockState(pos).getBoundingBox(mc.world, pos).offset(pos));
+            }
         }
     }