diff --git a/scripts/eressea/ponnuki.lua b/scripts/eressea/ponnuki.lua
index 29f882ab5..1a5d1959e 100644
--- a/scripts/eressea/ponnuki.lua
+++ b/scripts/eressea/ponnuki.lua
@@ -38,6 +38,7 @@ function ponnuki.init()
                 u.name = "Ponnuki"
                 u.info = "Go, Ponnuki, Go!"
                 u.race_name = "Ritter von Go"
+                u.status = 5 -- FLIEHE
                 print(u:show())
             end
         else
diff --git a/src/monsters.c b/src/monsters.c
index d60268858..62c982532 100644
--- a/src/monsters.c
+++ b/src/monsters.c
@@ -748,10 +748,6 @@ void plan_monsters(faction * f)
                 produceexp(u, SK_PERCEPTION, u->number);
             }
 
-            if (u->status > ST_BEHIND) {
-                setstatus(u, ST_FIGHT);
-                /* all monsters fight */
-            }
             if (attacking && (!r->land || is_guard(u))) {
                 monster_attacks(u, true, false);
             }