diff --git a/src/main/java/net/atlas/combatify/mixin/ServerPlayerMixin.java b/src/main/java/net/atlas/combatify/mixin/ServerPlayerMixin.java
index 0a090384..047ffc42 100644
--- a/src/main/java/net/atlas/combatify/mixin/ServerPlayerMixin.java
+++ b/src/main/java/net/atlas/combatify/mixin/ServerPlayerMixin.java
@@ -52,7 +52,7 @@ public ServerPlayerMixin(EntityType<? extends LivingEntity> entityType, Level le
 	@Inject(method = "tick", at = @At(value = "HEAD"))
 	public void addShieldCrouch(CallbackInfo ci) {
 		Entity camera = getCamera();
-		if (((PlayerExtensions) this.player).isAttackAvailable(-1.0F) && retainAttack) {
+		if (((PlayerExtensions) this.player).isAttackAvailable(-1.0F) && retainAttack && Combatify.unmoddedPlayers.contains(getUUID())) {
 			swing(InteractionHand.MAIN_HAND);
 		}
 		if (camera != null) {