diff --git a/WebHostLib/autolauncher.py b/WebHostLib/autolauncher.py
index 78fff6c50991..e70a31bc4166 100644
--- a/WebHostLib/autolauncher.py
+++ b/WebHostLib/autolauncher.py
@@ -80,7 +80,7 @@ def keep_running():
                             room.last_activity >= datetime.utcnow() - timedelta(days=3))
                         for room in rooms:
                             # we have to filter twice, as the per-room timeout can't currently be PonyORM transpiled.
-                            if room.last_activity >= datetime.utcnow() - timedelta(seconds=room.timeout):
+                            if room.last_activity >= datetime.utcnow() - timedelta(seconds=room.timeout + 5):
                                 hosters[room.id.int % len(hosters)].start_room(room.id)
 
         except AlreadyRunningException:
diff --git a/WebHostLib/customserver.py b/WebHostLib/customserver.py
index 04b4b6a0a02a..f12069678182 100644
--- a/WebHostLib/customserver.py
+++ b/WebHostLib/customserver.py
@@ -21,7 +21,6 @@
 
 from MultiServer import Context, server, auto_shutdown, ServerCommandProcessor, ClientMessageProcessor, load_server_cert
 from Utils import restricted_loads, cache_argsless
-from .locker import Locker
 from .models import Command, GameDataPackage, Room, db
 
 
@@ -246,25 +245,24 @@ async def start_room(room_id):
             ctx.shutdown_task = asyncio.create_task(auto_shutdown(ctx, []))
             await ctx.shutdown_task
 
-            # ensure auto launch is on the same page in regard to room activity.
-            with db_session:
-                room: Room = Room.get(id=ctx.room_id)
-                room.last_activity = datetime.datetime.utcnow() - datetime.timedelta(seconds=room.timeout + 60)
-
         except (KeyboardInterrupt, SystemExit):
-            with db_session:
-                room = Room.get(id=room_id)
-                # ensure the Room does not spin up again on its own, minute of safety buffer
-                room.last_activity = datetime.datetime.utcnow() - datetime.timedelta(minutes=1, seconds=room.timeout)
+            pass
         except Exception:
             with db_session:
                 room = Room.get(id=room_id)
                 room.last_port = -1
-                # ensure the Room does not spin up again on its own, minute of safety buffer
-                room.last_activity = datetime.datetime.utcnow() - datetime.timedelta(minutes=1, seconds=room.timeout)
             raise
         finally:
-            rooms_shutting_down.put(room_id)
+            try:
+                with (db_session):
+                    # ensure the Room does not spin up again on its own, minute of safety buffer
+                    room = Room.get(id=room_id)
+                    room.last_activity = datetime.datetime.utcnow() - \
+                                         datetime.timedelta(minutes=1, seconds=room.timeout)
+                logging.info(f"Shutting down room {room_id} on {name}.")
+            finally:
+                await asyncio.sleep(5)
+                rooms_shutting_down.put(room_id)
 
     class Starter(threading.Thread):
         def run(self):