diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 5a55f25f5..48e6a3a6c 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1195,6 +1195,10 @@ bool CharacterController::updateCreatureState()
                         localCast->spellId = spellid;
                         localCast->pressed = true;
                         localCast->shouldSend = true;
+
+                        // Mark the attack as instant if there is no spellcast animation
+                        if (!mAnimation->hasAnimation("spellcast"))
+                            localCast->instant = true;
                     }
                     /*
                         End of tes3mp addition
@@ -1203,17 +1207,6 @@ bool CharacterController::updateCreatureState()
                     MWMechanics::CastSpell cast(mPtr, nullptr, false, mCastingManualSpell);
                     cast.playSpellCastingEffects(spellid, false);
 
-                    /*
-                        Start of tes3mp addition
-
-                        Mark the attack as instant if there is no spellcast animation
-                    */
-                    if (!mAnimation->hasAnimation("spellcast"))
-                        localCast->instant = true;
-                    /*
-                        End of tes3mp addition
-                    */
-
                     if (!mAnimation->hasAnimation("spellcast"))
                     {
                         MWBase::Environment::get().getWorld()->castSpell(mPtr, mCastingManualSpell); // No "release" text key to use, so cast immediately