diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java
index ac3f6336c..4f86496fe 100644
--- a/src/main/java/noppes/npcs/client/ClientEventHandler.java
+++ b/src/main/java/noppes/npcs/client/ClientEventHandler.java
@@ -84,7 +84,10 @@ public class ClientEventHandler {
     public void onRenderPlayer(RenderPlayerEvent.Post event) {
         EntityPlayer player = event.entityPlayer;
         if (Client.playerModelData.containsKey(player.getUniqueID())) {
-            GL11.glPopMatrix();
+            PlayerModelData data = Client.playerModelData.get(player.getUniqueID());
+            if (data.enabled()) {
+                GL11.glPopMatrix();
+            }
         }
         ClientEventHandler.renderingPlayer = null;