diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java
index b681d0c1..aa773429 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java
@@ -56,8 +56,11 @@ public abstract class BlockStateModelLoaderMixin implements IBlockStateModelLoad
                 ModernFix.LOGGER.error("Exception filtering states on {}", location, e);
                 filteredStates = null;
             }
-            this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());
-            filteredStates = null;
+            try {
+                this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());
+            } finally {
+                filteredStates = null;
+            }
         }
     }