diff --git a/daemon/control.c b/daemon/control.c
index d80147c1..bd6d8e1a 100644
--- a/daemon/control.c
+++ b/daemon/control.c
@@ -45,6 +45,14 @@ bool create_builtin_rooms(void)
 {
   ladish_room_handle room;
 
+  if (!ladish_room_create(basic_room, "Empty", &room))
+  {
+    log_error("ladish_room_create() failed.");
+    return false;
+  }
+
+  list_add_tail(ladish_room_get_list_node(room), &g_rooms);
+
   if (!ladish_room_create(basic_room, "Basic", &room))
   {
     log_error("ladish_room_create() failed.");
@@ -52,6 +60,7 @@ bool create_builtin_rooms(void)
   }
 
   list_add_tail(ladish_room_get_list_node(room), &g_rooms);
+
   return true;
 }