diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index f264224c6..697fece12 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -393,11 +393,11 @@ public:
 
         void Dragonspireroomstore()
         {
-            uint8 creatureCount;
 
             for (uint8 i = 0; i < 7; ++i)
             {
-                creatureCount = 0;
+                // Refresh the creature list
+                runecreaturelist[i].clear();
 
                 if (GameObject* rune = instance->GetGameObject(go_roomrunes[i]))
                 {
@@ -409,8 +409,7 @@ public:
                         {
                             if (Creature* creature = *itr)
                             {
-                                runecreaturelist[i][creatureCount] = creature->GetGUID();
-                                ++creatureCount;
+                                runecreaturelist[i].push_back(creature->GetGUID());
                             }
                         }
                     }
@@ -432,9 +431,9 @@ public:
 
                 if (rune->GetGoState() == GO_STATE_ACTIVE)
                 {
-                    for (uint8 ii = 0; ii < 5; ++ii)
+                    for (ObjectGuid const& guid : runecreaturelist[i])
                     {
-                        mob = instance->GetCreature(runecreaturelist[i][ii]);
+                        mob = instance->GetCreature(guid);
                         if (mob && mob->IsAlive())
                             _mobAlive = true;
                     }
@@ -554,7 +553,7 @@ public:
         ObjectGuid go_blackrockaltar;
         ObjectGuid go_roomrunes[7];
         ObjectGuid go_emberseerrunes[7];
-        ObjectGuid runecreaturelist[7][5];
+        GuidVector runecreaturelist[7];
         ObjectGuid go_portcullis_active;
         ObjectGuid go_portcullis_tobossrooms;
         ObjectGuid go_urok_pile;