diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index f88bc90d2..232230a27 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -166,6 +166,7 @@ public:
                 case DATA_CYANIGOSA:
                     if (state == DONE)
                     {
+                        _events.Reset();
                         _encounterStatus = DONE;
                         HandleGameObject(DATA_MAIN_DOOR, true);
                         DoUpdateWorldState(WORLD_STATE_VIOLET_HOLD_SHOW, 0);
@@ -556,7 +557,12 @@ public:
             DoUpdateWorldState(WORLD_STATE_VIOLET_HOLD_SHOW, 0);
             _encounterStatus = NOT_STARTED;
             _gateHealth = 100;
-            _waveCount = 0;
+            if (GetBossState(DATA_2ND_BOSS) == DONE)
+                _waveCount = 12;
+            else if (GetBossState(DATA_1ST_BOSS) == DONE)
+                _waveCount = 6;
+            else
+                _waveCount = 0;
             _defensesUsed = false;
             if (GetBossState(DATA_CYANIGOSA) == DONE)
                 _encounterStatus = DONE;