diff --git a/src/main/java/electrosphere/renderer/model/Mesh.java b/src/main/java/electrosphere/renderer/model/Mesh.java
index 344eb941..53109e18 100644
--- a/src/main/java/electrosphere/renderer/model/Mesh.java
+++ b/src/main/java/electrosphere/renderer/model/Mesh.java
@@ -500,15 +500,21 @@ public class Mesh {
         
         
         if(renderPipelineState.getInstanced()){
-            GL45.glDrawElementsInstanced(GL_TRIANGLES, elementCount, GL_UNSIGNED_INT, 0, renderPipelineState.getInstanceCount());
-            Globals.renderingEngine.checkError();
+            if(elementCount > 0 ){
+                GL45.glDrawElementsInstanced(GL_TRIANGLES, elementCount, GL_UNSIGNED_INT, 0, renderPipelineState.getInstanceCount());
+                Globals.renderingEngine.checkError();
+            }
         } else {
             if(useElementArray){
-                GL11.glDrawElements(GL_TRIANGLES, elementCount, GL_UNSIGNED_INT, 0);
-                Globals.renderingEngine.checkError();
+                if(elementCount > 0){
+                    GL11.glDrawElements(GL_TRIANGLES, elementCount, GL_UNSIGNED_INT, 0);
+                    Globals.renderingEngine.checkError();
+                }
             } else {
-                GL11.glDrawArrays(GL_TRIANGLES, 0, elementCount);
-                Globals.renderingEngine.checkError();
+                if(elementCount > 0){
+                    GL11.glDrawArrays(GL_TRIANGLES, 0, elementCount);
+                    Globals.renderingEngine.checkError();
+                }
             }
         }
         glBindVertexArray(0);
diff --git a/src/test/java/electrosphere/util/ds/OctreeTests.java b/src/test/java/electrosphere/util/ds/OctreeTests.java
index f4b54e4c..a5865a12 100644
--- a/src/test/java/electrosphere/util/ds/OctreeTests.java
+++ b/src/test/java/electrosphere/util/ds/OctreeTests.java
@@ -11,7 +11,6 @@ import java.util.List;
 import java.util.Random;
 
 import org.joml.Vector3d;
-import org.junit.jupiter.api.Test;
 
 import annotations.BigDataTest;
 import annotations.FastTest;