diff --git a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java
index 0d70bffd..f89ca7ef 100644
--- a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java
+++ b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java
@@ -235,6 +235,10 @@ public class ModelFactory {
             if (possibleDuplicate != -1) {//Duplicate found
                 this.idMappings[blockId] = possibleDuplicate;
                 modelId = possibleDuplicate;
+                //Remove from flight
+                if (!this.blockStatesInFlight.remove(blockId)) {
+                    throw new IllegalStateException();
+                }
                 return;
             } else {//Not a duplicate so create a new entry
                 modelId = this.modelTexture2id.size();