diff --git a/Source/Game/AI/SmartScripts/SmartScript.cs b/Source/Game/AI/SmartScripts/SmartScript.cs
index fb4f0a95a..ffeae5463 100644
--- a/Source/Game/AI/SmartScripts/SmartScript.cs
+++ b/Source/Game/AI/SmartScripts/SmartScript.cs
@@ -982,7 +982,7 @@ namespace Game.AI
                                     ((SmartAI)smartAI).StartDespawn();
                                 }
                                 else
-                                    creature.DespawnOrUnsummon(respawnDelay);
+                                    creature.DespawnOrUnsummon(TimeSpan.FromMilliseconds(respawnDelay));
                             }
                             else
                             {
diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index 2ca9e4ff5..b8d8c23d5 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -45,6 +45,7 @@ namespace Game.Entities
             m_updateFlag.Rotation = true;
 
             m_respawnDelayTime = 300;
+            m_despawnDelay = 0;
             m_lootState = LootState.NotReady;
             m_spawnedByDefault = true;
 
@@ -423,6 +424,14 @@ namespace Game.Entities
             else if (!AIM_Initialize())
                 Log.outError(LogFilter.Server, "Could not initialize GameObjectAI");
 
+            if (m_despawnDelay != 0)
+            {
+                if (m_despawnDelay > diff)
+                    m_despawnDelay -= diff;
+                else
+                    DespawnOrUnsummon();
+            }
+
             switch (m_lootState)
             {
                 case LootState.NotReady:
@@ -861,6 +870,21 @@ namespace Game.Entities
             m_unique_users.Add(player.GetGUID());
         }
 
+        void DespawnOrUnsummon(TimeSpan delay = default)
+        {
+            if (delay > TimeSpan.Zero)
+            {
+                if (m_despawnDelay == 0 || m_despawnDelay > delay.TotalMilliseconds)
+                    m_despawnDelay = (uint)delay.TotalMilliseconds;
+            }
+            else
+            {
+                if (m_goData != null && m_respawnDelayTime != 0)
+                    SaveRespawnTime(m_respawnDelayTime);
+                Delete();
+            }
+        }
+
         public void Delete()
         {
             SetLootState(LootState.NotReady);
@@ -1160,7 +1184,7 @@ namespace Game.Entities
 
         public override void SaveRespawnTime(uint forceDelay = 0, bool savetodb = true)
         {
-            if (m_goData != null && m_respawnTime > GameTime.GetGameTime() && m_spawnedByDefault)
+            if (m_goData != null && (forceDelay != 0 || m_respawnTime > GameTime.GetGameTime()) && m_spawnedByDefault)
             {
                 if (m_respawnCompatibilityMode)
                 {
@@ -2858,6 +2882,7 @@ namespace Game.Entities
         uint m_spellId;
         long m_respawnTime;                          // (secs) time of next respawn (or despawn if GO have owner()),
         uint m_respawnDelayTime;                     // (secs) if 0 then current GO state no dependent from timer
+        uint m_despawnDelay;
         LootState m_lootState;
         ObjectGuid m_lootStateUnitGUID;                    // GUID of the unit passed with SetLootState(LootState, Unit*)
         bool m_spawnedByDefault;