diff --git a/DorkNet.Server/Controllers/API/Rooms/V2/RoomsController.cs b/DorkNet.Server/Controllers/API/Rooms/V2/RoomsController.cs
index 07b5cea..84ca2ab 100644
--- a/DorkNet.Server/Controllers/API/Rooms/V2/RoomsController.cs
+++ b/DorkNet.Server/Controllers/API/Rooms/V2/RoomsController.cs
@@ -293,14 +293,30 @@ public class RoomsController(
=> Ok((await rooms.HotAsync(null)).Select(RoomService.ToWireRoom).ToList());
///
- /// `Rooms.GetBaseRooms` — list of "base" rooms used by Rec Room Originals
- /// to seed the room creation UI. Returns the same set as #recroomoriginal.
+ /// `Rooms.GetBaseRooms` — the room-creation "base room" picker. A fixed,
+ /// admin-curated list of room NAMES (server setting
+ /// BaseRoomNamesJson, default ), resolved to rooms
+ /// in the configured order. Names are looked up via
+ /// , which also finds
+ /// HiddenFromBrowse rooms like MakerRoom. Edit the list from the admin SPA
+ /// (api/admin/v1/settings/base-rooms).
///
[HttpGet("api/rooms/v2/baserooms")]
[HttpGet("api/rooms/v3/baserooms")]
[HttpGet("rooms/base")]
public async Task BaseRooms()
- => Ok((await rooms.HotAsync("#recroomoriginal")).Select(RoomService.ToWireRoom).ToList());
+ {
+ var names = await serverSettings.GetBaseRoomNamesAsync();
+ var result = new List