diff --git a/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java b/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java
index d34ea9dc97..59512dd527 100644
--- a/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java
+++ b/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java
@@ -643,7 +643,7 @@ private void handle(SetCampaignMsg msg) {
     EventQueue.invokeLater(
         () -> {
           Campaign campaign = Campaign.fromDto(msg.getCampaign());
-          client.setCampaign(campaign);
+          MapTool.setCampaign(campaign);
 
           // Hide the "Connecting" overlay
           MapTool.getFrame().hideGlassPane();
@@ -1048,7 +1048,7 @@ private void handle(UpdatePlayerStatusMsg updatePlayerStatusMsg) {
     var loaded = updatePlayerStatusMsg.getLoaded();
 
     Player player =
-        MapTool.getPlayerList().stream()
+        client.getPlayerList().stream()
             .filter(x -> x.getName().equals(playerName))
             .findFirst()
             .orElse(null);