diff --git a/API/Services/GameManager/GameManager.cs b/API/Services/GameManager/GameManager.cs
index c596f8a..362cad8 100644
--- a/API/Services/GameManager/GameManager.cs
+++ b/API/Services/GameManager/GameManager.cs
@@ -77,6 +77,8 @@ public class GameManager(IGameRepository gameRepository, IHubContext<GameHubSock
                 Method = "Win",
                 Player = winPlayer
             });
+
+            ScheduleGameDeletion(game.Id, TimeSpan.FromSeconds(5));
         }
 
         if (game.Field.IsFull())
@@ -87,6 +89,8 @@ public class GameManager(IGameRepository gameRepository, IHubContext<GameHubSock
             {
                 Method = "Draw"
             });
+
+            ScheduleGameDeletion(game.Id, TimeSpan.FromSeconds(5));
         }
     }
 
@@ -102,10 +106,30 @@ public class GameManager(IGameRepository gameRepository, IHubContext<GameHubSock
 
         game.RemovePlayer(playerConnectionId);
         game.EndGame();
-        return hubContext.Clients.Group(game.Id).SendAsync("GameEnded", new
+        hubContext.Clients.Group(game.Id).SendAsync("GameEnded", new
         {
             Method = "PlayerDisconnected",
             Player = player
         });
+
+        ScheduleGameDeletion(game.Id, TimeSpan.FromSeconds(5));
+
+        return Task.CompletedTask;
+    }
+
+    private void ScheduleGameDeletion(string gameId, TimeSpan delay)
+    {
+        _ = Task.Run(async () =>
+        {
+            await Task.Delay(delay);
+
+            var g = gameRepository.GetOne(gameId);
+            if (g != null && g.State == GameState.Ended)
+            {
+                gameRepository.Destroy(gameId);
+
+                await hubContext.Clients.Group(gameId).SendAsync("GameDestroyed");
+            }
+        });
     }
 }
\ No newline at end of file