diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs
index 086fc00510..b5367518b1 100644
--- a/Content.Client/GameTicking/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/ClientGameTicker.cs
@@ -220,6 +220,7 @@ namespace Content.Client.GameTicking
 
             _lobby.CharacterPreview.CharacterSetupButton.OnPressed += args =>
             {
+                SetReady(false);
                 _userInterfaceManager.StateRoot.RemoveChild(_lobby);
                 _userInterfaceManager.StateRoot.AddChild(_characterSetup);
             };
@@ -237,12 +238,7 @@ namespace Content.Client.GameTicking
 
             _lobby.ReadyButton.OnToggled += args =>
             {
-                if (_gameStarted)
-                {
-                    return;
-                }
-
-                _console.ProcessCommand($"toggleready {args.Pressed}");
+                SetReady(args.Pressed);
             };
 
             _lobby.LeaveButton.OnPressed += args => _console.ProcessCommand("disconnect");
@@ -250,6 +246,16 @@ namespace Content.Client.GameTicking
             _updatePlayerList();
         }
 
+        private void SetReady(bool newReady)
+        {
+            if (_gameStarted)
+            {
+                return;
+            }
+
+            _console.ProcessCommand($"toggleready {newReady}");
+        }
+
         private void _joinGame(MsgTickerJoinGame message)
         {
             if (_tickerState == TickerState.InGame)