diff --git a/components/cluster/clustercomponent.cpp b/components/cluster/clustercomponent.cpp
index 9ac47eaf0..041d21805 100644
--- a/components/cluster/clustercomponent.cpp
+++ b/components/cluster/clustercomponent.cpp
@@ -440,8 +440,9 @@ void ClusterComponent::NewClientHandler(const Socket::Ptr& client, TlsRole role)
 		if (oldClient)
 			oldClient->Close();
 
-		ReplayLog(endpoint, tlsStream);
 		endpoint->SetClient(tlsStream);
+
+		ReplayLog(endpoint, tlsStream);
 	}
 }