diff --git a/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp b/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
index 5a137d1664..a4e7bd24fa 100644
--- a/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
+++ b/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
@@ -132,14 +132,12 @@ void SRemoteServer::StopServer()
     m_bAcceptClients = false;
     AZ::AzSock::CloseSocket(m_socket);
     m_socket = SOCKET_ERROR;
-    {
-        AZStd::scoped_lock lock(m_mutex);
-        for (TClients::iterator it = m_clients.begin(); it != m_clients.end(); ++it)
-        {
-            it->pClient->StopClient();
-        }
-    }
+
     AZStd::unique_lock<AZStd::recursive_mutex> lock(m_mutex);
+    for (TClients::iterator it = m_clients.begin(); it != m_clients.end(); ++it)
+    {
+        it->pClient->StopClient();
+    }
     m_stopCondition.wait(lock, [this] { return m_clients.empty(); });
 }