diff --git a/SlipItIn.Server.Tests/GameHubTests.cs b/SlipItIn.Server.Tests/GameHubTests.cs
index 669a609..7024c35 100644
--- a/SlipItIn.Server.Tests/GameHubTests.cs
+++ b/SlipItIn.Server.Tests/GameHubTests.cs
@@ -24,6 +24,8 @@ public class GameHubTests
     private readonly Mock<ISingleClientProxy> _callerProxy = new();
     private readonly Mock<IClientProxy> _groupProxy = new();
     private readonly Mock<ISingleClientProxy> _clientProxy = new();
+    private readonly Mock<IHubContext<GameHub>> _hubContext = new();
+    private readonly Mock<IHubClients> _hubClients = new();
     private readonly GameHub _hub;
 
     private const string ConnectionId = "test-connection-id";
@@ -35,7 +37,11 @@ public class GameHubTests
         _clients.Setup(c => c.Group(It.IsAny<string>())).Returns(_groupProxy.Object);
         _clients.Setup(c => c.Client(It.IsAny<string>())).Returns(_clientProxy.Object);
 
-        _hub = new GameHub(_gameService.Object, _factory, NullLogger<GameHub>.Instance);
+        _hubClients.Setup(c => c.Group(It.IsAny<string>())).Returns(_groupProxy.Object);
+        _hubClients.Setup(c => c.Client(It.IsAny<string>())).Returns(_clientProxy.Object);
+        _hubContext.Setup(c => c.Clients).Returns(_hubClients.Object);
+
+        _hub = new GameHub(_gameService.Object, _factory, NullLogger<GameHub>.Instance, _hubContext.Object);
         SetupContext();
     }
 
diff --git a/SlipItIn.Server/Hubs/GameHub.cs b/SlipItIn.Server/Hubs/GameHub.cs
index 9f01a48..bf5e59f 100644
--- a/SlipItIn.Server/Hubs/GameHub.cs
+++ b/SlipItIn.Server/Hubs/GameHub.cs
@@ -14,12 +14,18 @@ public class GameHub : Hub
     private readonly IGameService _gameService;
     private readonly IDbContextFactory<SlipItInDbContext> _contextFactory;
     private readonly ILogger<GameHub> _logger;
+    private readonly IHubContext<GameHub> _hubContext;
 
-    public GameHub(IGameService gameService, IDbContextFactory<SlipItInDbContext> contextFactory, ILogger<GameHub> logger)
+    public GameHub(
+        IGameService gameService,
+        IDbContextFactory<SlipItInDbContext> contextFactory,
+        ILogger<GameHub> logger,
+        IHubContext<GameHub> hubContext)
     {
         _gameService = gameService;
         _contextFactory = contextFactory;
         _logger = logger;
+        _hubContext = hubContext;
     }
 
     /// <summary>
@@ -260,10 +266,10 @@ public class GameHub : Hub
                         var targetP = await db.Players.FindAsync(playerId);
                         if (targetP?.ConnectionId != null)
                         {
-                            await Clients.Client(targetP.ConnectionId).SendAsync("PlayerHandUpdated", updatedHand);
+                            await _hubContext.Clients.Client(targetP.ConnectionId).SendAsync("PlayerHandUpdated", updatedHand);
                         }
 
-                        await Clients.Group(game.LobbyCode).SendAsync("GameStateUpdated", updatedGameState);
+                        await _hubContext.Clients.Group(game.LobbyCode).SendAsync("GameStateUpdated", updatedGameState);
                     }
                 }
                 catch (Exception ex)