diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs
index 35d55a20e..07de1ca0e 100644
--- a/Source/Game/Entities/Unit/Unit.Spells.cs
+++ b/Source/Game/Entities/Unit/Unit.Spells.cs
@@ -1780,7 +1780,8 @@ namespace Game.Entities
         {
             while (!m_removedAuras.Empty())
             {
-                m_removedAuras.Remove(m_removedAuras.First());
+                m_removedAuras.First().Dispose();
+                m_removedAuras.RemoveAt(0);
             }
 
             m_removedAurasCount = 0;
diff --git a/Source/Game/World/WorldStateManager.cs b/Source/Game/World/WorldStateManager.cs
index ce780096e..3a7d90753 100644
--- a/Source/Game/World/WorldStateManager.cs
+++ b/Source/Game/World/WorldStateManager.cs
@@ -64,7 +64,7 @@ namespace Game
                             continue;
                         }
 
-                        if (!CliDB.MapStorage.ContainsKey(mapId) && mapId != AnyMap)
+                        if (mapId != AnyMap && !CliDB.MapStorage.ContainsKey(mapId))
                         {
                             Log.outError(LogFilter.Sql, $"Table `world_state` contains a world state {id} with invalid MapID ({mapId}), map ignored");
                             continue;