diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 904c9c9ca..ef3139f75 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1301,6 +1301,7 @@ bool Creature::LoadFromDB(uint32 guidlow, Map* map)
     m_respawnradius = data->spawndist;
 
     m_respawnDelay = data->spawntimesecs;
+    m_corpseDelay = std::min(m_respawnDelay * 9 / 10, m_corpseDelay); // set corpse delay to 90% of the respawn delay
     m_isDeadByDefault = data->is_dead;
     m_deathState = m_isDeadByDefault ? DEAD : ALIVE;
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 2195ff17e..4a788da1c 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 "12576"
+ #define REVISION_NR "12577"
 #endif // __REVISION_NR_H__