diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCanCreateRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCanCreateRoomEvent.java
index d1ed2bf0..b2b93714 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCanCreateRoomEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCanCreateRoomEvent.java
@@ -9,7 +9,7 @@ public class RequestCanCreateRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int count = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()).size();
-        int max = this.client.getHabbo().getHabboStats().maxRooms;
+        int max = this.client.getHabbo().getHabboStats().hasActiveClub() ? RoomManager.MAXIMUM_ROOMS_HC : RoomManager.MAXIMUM_ROOMS_USER;
         this.client.sendResponse(new CanCreateRoomComposer(count, max));
     }
 }
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java
index d0f8f83a..c5e921f3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java
@@ -48,7 +48,7 @@ public class RequestCreateRoomEvent extends MessageHandler {
             return;
 
         int count = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()).size();
-        int max = this.client.getHabbo().getHabboStats().maxRooms;
+        int max = this.client.getHabbo().getHabboStats().hasActiveClub() ? RoomManager.MAXIMUM_ROOMS_HC : RoomManager.MAXIMUM_ROOMS_USER;
 
         if (count >= max) {
             this.client.sendResponse(new CanCreateRoomComposer(count, max));