1 files changed, 11 insertions, 6 deletions
diff --git a/src/zenserver/storage/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp
index 44291395a..e7561e446 100644
--- a/src/zenserver/storage/zenstorageserver.cpp
+++ b/src/zenserver/storage/zenstorageserver.cpp
@@ -249,10 +249,11 @@ ZenStorageServer::InitializeServices(const ZenStorageServerConfig& ServerOptions
 	if (!ServerOptions.SessionsTargetUrl.empty())
 	{
 		m_SessionsClient = std::make_unique<SessionsServiceClient>(SessionsServiceClient::Options{
-			.TargetUrl = ServerOptions.SessionsTargetUrl,
-			.AppName   = "zenserver",
-			.Mode	   = GetServerMode(),
-			.SessionId = GetSessionId(),
+			.TargetUrl		 = ServerOptions.SessionsTargetUrl,
+			.AppName		 = "zenserver",
+			.Mode			 = GetServerMode(),
+			.SessionId		 = GetSessionId(),
+			.ParentSessionId = GetParentSessionId(),
 		});
 	}
 
@@ -846,10 +847,14 @@ ZenStorageServer::Run()
 
 	SetNewState(kRunning);
 
-	OnReady();
-
+	// Register the self-session and replay the backlog into it BEFORE
+	// OnReady disables the backlog — otherwise the in-proc session sink
+	// attaches against a disabled backlog and shows nothing from the
+	// startup window.
 	StartSelfSession("zenserver");
 
+	OnReady();
+
 	if (m_SessionsClient)
 	{
 		m_SessionsClient->Announce();