diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
index 868bc87e5..2ff2f92c1 100644
--- a/src/game/GameEventMgr.cpp
+++ b/src/game/GameEventMgr.cpp
@@ -421,7 +421,7 @@ uint32 GameEventMgr::Initialize()                           // return the next e
     m_ActiveEvents.clear();
     uint32 delay = Update();
     sLog.outBasic("Game Event system initialized." );
-    isSystemInit = true;
+    m_IsGameEventsInit = true;
     return delay;
 }
 
@@ -445,11 +445,14 @@ uint32 GameEventMgr::Update()                               // return the next e
                 StopEvent(itr);
             else
             {
-                if (!isSystemInit)
+                if (!m_IsGameEventsInit)
                 {
                     int16 event_nid = (-1) * (itr);
                     // spawn all negative ones for this event
                     GameEventSpawn(event_nid);
+
+                    // disable any event specific quest (for cases where creature is spawned, but event not active).
+                    UpdateEventQuests(itr, false);
                 }
             }
         }
@@ -740,7 +743,7 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate)
 
 GameEventMgr::GameEventMgr()
 {
-    isSystemInit = false;
+    m_IsGameEventsInit = false;
 }
 
 MANGOS_DLL_SPEC bool IsHolidayActive( HolidayIds id )
diff --git a/src/game/GameEventMgr.h b/src/game/GameEventMgr.h
index a05f07767..60a025ca5 100644
--- a/src/game/GameEventMgr.h
+++ b/src/game/GameEventMgr.h
@@ -94,7 +94,7 @@ class GameEventMgr
         GameEventIdMap    mGameEventPoolIds;
         GameEventDataMap  mGameEvent;
         ActiveEvents m_ActiveEvents;
-        bool isSystemInit;
+        bool m_IsGameEventsInit;
 };
 
 #define gameeventmgr MaNGOS::Singleton<GameEventMgr>::Instance()
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index d68ff4b51..6e4f79c60 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 "8501"
+ #define REVISION_NR "8502"
 #endif // __REVISION_NR_H__