diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
index b387b54f..f02db0d6 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
@@ -552,7 +552,7 @@ public abstract class Disguise {
     }
 
     protected void adjustTallSelfDisguiseScale() {
-        if (!canScaleDisguise()) {
+        if (!canScaleDisguise() || !isDisguiseInUse() || getEntity() == null) {
             return;
         }