diff --git a/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java b/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
index ec83e27e..e2d89b57 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
@@ -18,6 +18,7 @@ import me.libraryaddict.disguise.utilities.LibsEntityInteract;
 import me.libraryaddict.disguise.utilities.LibsPremium;
 import me.libraryaddict.disguise.utilities.modded.ModdedEntity;
 import me.libraryaddict.disguise.utilities.modded.ModdedManager;
+import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.RandomUtils;
@@ -467,7 +468,7 @@ public class DisguiseListener implements Listener {
             DisguiseUtilities.doBoundingBox((TargetedDisguise) disguise);
         }
 
-        if (DisguiseConfig.isStopShulkerDisguisesFromMoving()) {
+        if (!NmsVersion.v1_17.isSupported() && DisguiseConfig.isStopShulkerDisguisesFromMoving()) {
             Disguise disguise;
 
             if ((disguise = DisguiseAPI.getDisguise(event.getPlayer())) != null) {
diff --git a/src/main/resources/configs/sanity.yml b/src/main/resources/configs/sanity.yml
index 12dfe20f..0a184e20 100644
--- a/src/main/resources/configs/sanity.yml
+++ b/src/main/resources/configs/sanity.yml
@@ -1,6 +1,7 @@
 # This config is called sanity, because you shouldn't need to change the stuff in here
 
-#Stop shulker disguises from moving, they're weird. This option only effects PLAYERS that are disguised, other entities disguised as shulkers will NOT be effected!
+# Stop shulker disguises from moving, they're weird. This option only effects PLAYERS that are disguised, other entities disguised as shulkers will NOT be effected!
+# This is ignored in 1.17+ as its fixed in those versions
 StopShulkerDisguisesFromMoving: true
 
 # This means that the plugin doesn't need to constantly call Mojang just to find a skin for an offline player