diff --git a/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java b/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java
index df280415..1f25f533 100644
--- a/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java
+++ b/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java
@@ -75,7 +75,9 @@ public class EntityRendererMap implements Map<EntityType<?>, EntityRenderer<?>>
             if(renderer == null)
                 throw new AssertionError("Returned entity renderer should never be null");
             return renderer;
-        } catch(ExecutionException e) {
+        } catch (IllegalStateException e) {
+            return null; /* emulate value not being present if recursive load occurs */
+        } catch (ExecutionException e) {
             throw new RuntimeException(e);
         }
     }