diff --git a/src/model/schedule.ts b/src/model/schedule.ts
index 28660fd..69fbd27 100644
--- a/src/model/schedule.ts
+++ b/src/model/schedule.ts
@@ -427,14 +427,16 @@ export class ScheduleModel {
 			}
 		}
 
+		for (const room of rooms) {
+			const roomEvents = allEvents.filter((event) => event.room_id === room.id);
+			room.events = roomEvents;
+		}
+
 		return {
 			count: rooms.length,
 			page: page,
 			total_count: roomTotalCount,
-			list: {
-				rooms: rooms,
-				events: allEvents,
-			}
+			list: rooms,
 		};
 	}