diff --git a/app/router/score.py b/app/router/score.py
index 9963559..70664a5 100644
--- a/app/router/score.py
+++ b/app/router/score.py
@@ -285,10 +285,8 @@ async def create_playlist_score(
     room = await session.get(Room, room_id)
     if not room:
         raise HTTPException(status_code=404, detail="Room not found")
-    db_room_time = (
-        room.ends_at.replace(tzinfo=UTC) if room.ends_at is not None else room.starts_at
-    )
-    if db_room_time and db_room_time < datetime.now(UTC):
+    db_room_time = room.ends_at.replace(tzinfo=UTC) if room.ends_at else None
+    if db_room_time and db_room_time < datetime.now(UTC).replace(tzinfo=UTC):
         raise HTTPException(status_code=400, detail="Room has ended")
     item = (
         await session.exec(
diff --git a/app/signalr/hub/multiplayer.py b/app/signalr/hub/multiplayer.py
index b7aa14c..135d2ac 100644
--- a/app/signalr/hub/multiplayer.py
+++ b/app/signalr/hub/multiplayer.py
@@ -858,7 +858,7 @@ class MultiplayerHub(Hub[MultiplayerClientState]):
                 .where(col(Room.id) == room.room.room_id)
                 .values(
                     name=room.room.settings.name,
-                    ended_at=datetime.now(UTC),
+                    ends_at=datetime.now(UTC),
                     type=room.room.settings.match_type,
                     queue_mode=room.room.settings.queue_mode,
                     auto_skip=room.room.settings.auto_skip,