diff --git a/src/main/java/net/minecraftforge/client/model/IPerspectiveState.java b/src/main/java/net/minecraftforge/client/model/IPerspectiveState.java
index ca9d25de2a..5d030ec883 100644
--- a/src/main/java/net/minecraftforge/client/model/IPerspectiveState.java
+++ b/src/main/java/net/minecraftforge/client/model/IPerspectiveState.java
@@ -52,7 +52,9 @@ public interface IPerspectiveState extends IModelState
 
         public IModelState forPerspective(TransformType type)
         {
-            return states.getOrDefault(type, TRSRTransformation.identity());
+            IModelState state = states.get(type);
+            if(state == null) state = TRSRTransformation.identity();
+            return state;
         }
     }
 }
diff --git a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java
index d80d81b0b8..8077cc5333 100644
--- a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java
+++ b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java
@@ -144,8 +144,9 @@ public class ItemLayerModel implements IRetexturableModel {
         @Override
         public Pair<IBakedModel, Matrix4f> handlePerspective(TransformType cameraTransformType)
         {
-            TRSRTransformation tr = transforms.getOrDefault(cameraTransformType, TRSRTransformation.identity());
-            Matrix4f mat = tr == TRSRTransformation.identity() ? null : tr.getMatrix();
+            TRSRTransformation tr = transforms.get(cameraTransformType);
+            Matrix4f mat = null;
+            if(tr != null && tr != TRSRTransformation.identity()) mat = tr.getMatrix();
             return Pair.of((IBakedModel)this, mat);
         }
     }