diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
index dae74b50..ce81c541 100644
--- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
@@ -293,8 +293,6 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
         if (swingProgress > -9990.0F && !isSleeping) {
             EnumHandSide mainSide = getMainHand(entity);
 
-            if (getArmPoseForSide(mainSide) == ArmPose.EMPTY) return;
-
             swingArm(getArmForSide(mainSide));
         }
     }
diff --git a/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java b/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java
index 47bf83f8..610e274c 100644
--- a/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java
+++ b/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java
@@ -63,11 +63,10 @@ public class ModelAlicorn extends ModelPegasus implements IModelUnicorn {
 
     @Override
     protected void swingItem(Entity entity, float swingProgress) {
-        if (canCast()) {
-            if (swingProgress > -9990.0F && !isSleeping) {
-                EnumHandSide mainSide = getMainHand(entity);
+        EnumHandSide mainSide = getMainHand(entity);
 
-                if (getArmPoseForSide(mainSide) == ArmPose.EMPTY) return;
+        if (canCast() && getArmPoseForSide(mainSide) != ArmPose.EMPTY) {
+            if (swingProgress > -9990.0F && !isSleeping) {
                 swingArm(getUnicornArmForSide(mainSide));
             }
         } else {