diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp
index 44837ed78..865e19891 100644
--- a/src/game/CreatureEventAI.cpp
+++ b/src/game/CreatureEventAI.cpp
@@ -849,6 +849,9 @@ void CreatureEventAI::JustDied(Unit* killer)
         if ((*i).Event.event_type == EVENT_T_DEATH)
             ProcessEvent(*i, killer);
     }
+
+    // reset phase after any death state events
+    Phase = 0;
 }
 
 void CreatureEventAI::KilledUnit(Unit* victim)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 3aaa6e28b..e5892f9d2 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 "8016"
+ #define REVISION_NR "8017"
 #endif // __REVISION_NR_H__