diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index ed675c4b2..c63a58b07 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1703,6 +1703,9 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /
     if (isCivilian())
         return false;
 
+    if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PASSIVE))
+        return false;
+
     // skip fighting creature
     if (isInCombat())
         return false;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 11592d95a..1635e34dd 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10403"
+ #define REVISION_NR "10404"
 #endif // __REVISION_NR_H__