diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
index 3d265404..cf1e289e 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
@@ -386,8 +386,8 @@ public class RoomManager {
             if (Emulator.getPluginManager().fireEvent(new RoomUncachedEvent(room)).isCancelled())
                 continue;
 
-            this.activeRooms.remove(room.getId());
             room.dispose();
+            this.activeRooms.remove(room.getId());
         }
     }