diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 995940ebf..57da43f75 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -602,7 +602,7 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map)
     if (!Create(guid,entry, map, phaseMask, x, y, z, ang, rotation0, rotation1, rotation2, rotation3, animprogress, go_state) )
         return false;
 
-    if(!GetGOInfo()->GetDespawnPossibility() && !GetGOInfo()->IsDespawnAtAction())
+    if (!GetGOInfo()->GetDespawnPossibility() && !GetGOInfo()->IsDespawnAtAction() && data->spawntimesecs >= 0)
     {
         SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NODESPAWN);
         m_spawnedByDefault = true;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index e4f7238a3..7d2857740 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 "8569"
+ #define REVISION_NR "8570"
 #endif // __REVISION_NR_H__