3 files changed, 11 insertions, 13 deletions
diff --git a/src/zenserver/storage/storageconfig.cpp b/src/zenserver/storage/storageconfig.cpp
index bb4f053e4..b4d97257d 100644
--- a/src/zenserver/storage/storageconfig.cpp
+++ b/src/zenserver/storage/storageconfig.cpp
@@ -379,7 +379,6 @@ ZenStorageServerConfigurator::AddConfigOptions(LuaConfig::Options& LuaOptions)
 
 	////// server
 	LuaOptions.AddOption("server.pluginsconfigfile"sv, ServerOptions.PluginsConfigFile, "plugins-config"sv);
-	LuaOptions.AddOption("sessions.url"sv, ServerOptions.SessionsTargetUrl, "sessions-url"sv);
 
 	////// objectstore
 	LuaOptions.AddOption("server.objectstore.enabled"sv, ServerOptions.ObjectStoreEnabled, "objectstore-enabled"sv);
@@ -630,8 +629,6 @@ ZenStorageServerCmdLineOptions::AddCliOptions(cxxopts::Options& options, ZenStor
 						  cxxopts::value(ServerOptions.ScrubOptions)->implicit_value("yes"),
 						  "(nocas,nogc,nodelete,yes,no)*");
 
-	options.add_options()("sessions-url", "URL of remote zenserver to announce session to", cxxopts::value<std::string>(SessionsTargetUrl));
-
 	AddSecurityOptions(options, ServerOptions);
 	AddCacheOptions(options, ServerOptions);
 	AddGcOptions(options, ServerOptions);
@@ -1088,7 +1085,6 @@ ZenStorageServerCmdLineOptions::ApplyOptions(cxxopts::Options& options, ZenStora
 			{.Name = OpenIdProviderName, .Url = OpenIdProviderUrl, .ClientId = OpenIdClientId});
 	}
 
-	ServerOptions.SessionsTargetUrl	  = SessionsTargetUrl;
 	ServerOptions.ObjectStoreConfig	  = ParseBucketConfigs(BucketConfigs);
 	ServerOptions.OidcTokenExecutable = MakeSafeAbsolutePath(OidcTokenExecutable);
 }
diff --git a/src/zenserver/storage/storageconfig.h b/src/zenserver/storage/storageconfig.h
index fec8fd70b..bb6c929a9 100644
--- a/src/zenserver/storage/storageconfig.h
+++ b/src/zenserver/storage/storageconfig.h
@@ -163,7 +163,6 @@ struct ZenStorageServerConfig : public ZenServerConfig
 	bool					 RestrictContentTypes = false;
 	std::filesystem::path	 OidcTokenExecutable;
 	bool					 AllowExternalOidcTokenExe = true;
-	std::string				 SessionsTargetUrl;
 };
 
 struct ZenStorageServerCmdLineOptions
@@ -185,8 +184,6 @@ struct ZenStorageServerCmdLineOptions
 
 	void AddSecurityOptions(cxxopts::Options& options, ZenStorageServerConfig& ServerOptions);
 
-	std::string SessionsTargetUrl;
-
 	std::string UpstreamCachePolicyOptions;
 
 	void AddCacheOptions(cxxopts::Options& options, ZenStorageServerConfig& ServerOptions);
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();