diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 4b197d273..e89ad2be7 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1312,7 +1312,11 @@ bool CharacterController::updateWeaponState()
                     mAttackType = "shoot";
                 else
                 {
-                    if(mPtr == getPlayer())
+                    // tes3mp needs player-controlled NPCs to not have their attacks
+                    // cancelled here, so a 2nd condition has been added that should
+                    // return true only for them
+
+                    if(mPtr == getPlayer() || !mPtr.getBase()->canChangeCell)
                     {
                         if (isWeapon)
                         {