diff --git a/backend/src/api.js b/backend/src/api.js
index b6b4bb3..328e0ac 100644
--- a/backend/src/api.js
+++ b/backend/src/api.js
@@ -213,8 +213,8 @@ router.post("/games", asyncHandler(async (req, res) => {
     try {
         await conn.beginTransaction();
         const [gameResult] = await conn.query(
-            "INSERT INTO current_games (is_open, is_local, current_playing_user) VALUES (?, ?, ?)",
-            [true, is_local, user]
+            "INSERT INTO current_games (is_open, is_local) VALUES (?, ?, ?)",
+            [true, is_local]
         );
 
         const gameId = gameResult.insertId;
@@ -364,9 +364,10 @@ router.patch("/games/:id/lock", asyncHandler(async (req, res) => {
             [turnOrder[i], turnOrder[j]] = [turnOrder[j], turnOrder[i]];
         }
 
+        const currentPlayingUser = turnOrder[0];
         await conn.query(
-            "UPDATE current_games SET is_open = FALSE, turn_order = ? WHERE id = ?",
-            [JSON.stringify(turnOrder), gameId]
+            "UPDATE current_games SET is_open = FALSE, turn_order = ?, current_playing_user = ? WHERE id = ?",
+            [JSON.stringify(turnOrder), gameId, currentPlayingUser]
         );
 
         await conn.commit();