diff --git a/CommonClient.py b/CommonClient.py
index 8325227d5e5c..296c10ed4b4e 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -325,7 +325,6 @@ def __init__(self, server_address: typing.Optional[str] = None, password: typing
             "collect": "disabled",
             "remaining": "disabled",
         }
-        self.race_mode: int = 0
 
         # own state
         self.finished_game = False
@@ -455,7 +454,7 @@ async def send_connect(self, **kwargs: typing.Any) -> None:
         if kwargs:
             payload.update(kwargs)
         await self.send_msgs([payload])
-        await self.send_msgs([{"cmd": "Get", "keys": ["race_mode"]}])
+        await self.send_msgs([{"cmd": "Get", "keys": ["_read_race_mode"]}])
 
     async def console_input(self) -> str:
         if self.ui:
diff --git a/MultiServer.py b/MultiServer.py
index 91f4eec61574..c3e377e9a29d 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -428,7 +428,7 @@ def _load(self, decoded_obj: dict, game_data_packages: typing.Dict[str, typing.A
 
         self.read_data = {}
         # there might be a better place to put this.
-        self.stored_data["race_mode"] = decoded_obj.get("race_mode", 0)
+        self.read_data["race_mode"] = lambda: decoded_obj.get("race_mode", 0)
         mdata_ver = decoded_obj["minimum_versions"]["server"]
         if mdata_ver > version_tuple:
             raise RuntimeError(f"Supplied Multidata (.archipelago) requires a server of at least version {mdata_ver},"
diff --git a/docs/network protocol.md b/docs/network protocol.md
index f8080fecc879..1c4579c4066f 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -395,6 +395,7 @@ Some special keys exist with specific return data, all of them have the prefix `
 | item_name_groups_{game_name}     | dict\[str, list\[str\]\]      | item_name_groups belonging to the requested game.     |
 | location_name_groups_{game_name} | dict\[str, list\[str\]\]      | location_name_groups belonging to the requested game. |
 | client_status_{team}_{slot}      | [ClientStatus](#ClientStatus) | The current game status of the requested player.      |
+| race_mode                        | int                           | 0 if race mode is disabled, and 1 if it's enabled.    |
 
 ### Set
 Used to write data to the server's data storage, that data can then be shared across worlds or just saved for later. Values for keys in the data storage can be retrieved with a [Get](#Get) package, or monitored with a [SetNotify](#SetNotify) package.
diff --git a/kvui.py b/kvui.py
index d58af3ed0e78..74d8ad06734a 100644
--- a/kvui.py
+++ b/kvui.py
@@ -243,8 +243,9 @@ def get_text(self):
                             f"\nYou currently have {ctx.hint_points} points."
                 elif ctx.hint_cost == 0:
                     text += "\n!hint is free to use."
-                if ctx.stored_data and "race_mode" in ctx.stored_data:
-                    text += "\nRace mode is enabled." if ctx.stored_data["race_mode"] else "\nRace mode is disabled."
+                if ctx.stored_data and "_read_race_mode" in ctx.stored_data:
+                    text += "\nRace mode is enabled." \
+                        if ctx.stored_data["_read_race_mode"] else "\nRace mode is disabled."
             else:
                 text += f"\nYou are not authenticated yet."