diff --git a/RLBotCS/Server/FlatBuffersSession.cs b/RLBotCS/Server/FlatBuffersSession.cs
index 2c5cc4a..e043fba 100644
--- a/RLBotCS/Server/FlatBuffersSession.cs
+++ b/RLBotCS/Server/FlatBuffersSession.cs
@@ -419,7 +419,7 @@ private async Task HandleInternalMessages()
 
                     break;
                 case SessionMessage.StopMatch m
-                    when m.Force || (_connectionEstablished && _closeBetweenMatches):
+                    when m.Force || (_isReady && _closeBetweenMatches):
                     _sessionForceClosed = m.Force;
                     return;
                 case SessionMessage.UpdateRendering m