diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index a49fe41ee..775caeb74 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1819,6 +1819,10 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /
     if (!isAlive())
         return false;
 
+    // we don't need help from non-combatant ;)
+    if (isCivilian())
+        return false;
+
     // skip fighting creature
     if (isInCombat())
         return false;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 79db01fe1..9f38504d6 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 "8203"
+ #define REVISION_NR "8204"
 #endif // __REVISION_NR_H__