diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 44334b830d7615..ade73c33de26bb 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2041,11 +2041,12 @@ void Creature::Respawn(bool force)
         }
 
         LOG_DEBUG("entities.unit", "Respawning creature {} (SpawnId: {}, {})", GetName(), GetSpawnId(), GetGUID().ToString());
+        setDeathState(DeathState::Respawning);
         m_respawnTime = 0;
         ResetPickPocketLootTime();
         loot.clear();
-        SelectLevel();
 
+        SelectLevel();
         setDeathState(DeathState::JustRespawned);
 
         // MDic - Acidmanifesto
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 28200fc5a2f0bd..6f05ec2acd19ec 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -317,7 +317,8 @@ enum class DeathState : uint8
     JustDied      = 1,
     Corpse        = 2,
     Dead          = 3,
-    JustRespawned = 4,
+    Respawning    = 4,
+    JustRespawned = 5,
 };
 
 enum UnitState