diff --git a/Source/Csla.Blazor/State/StateManager.cs b/Source/Csla.Blazor/State/StateManager.cs
index 01cb84dc41..eb0b1f80ad 100644
--- a/Source/Csla.Blazor/State/StateManager.cs
+++ b/Source/Csla.Blazor/State/StateManager.cs
@@ -13,8 +13,9 @@ namespace Csla.Blazor.State
   /// <summary>
   /// Get and save state from Blazor pages.
   /// </summary>
+  /// <param name="sessionIdManager"></param>
   /// <param name="sessionManager"></param>
-  public class StateManager(ISessionManager sessionManager)
+  public class StateManager(ISessionIdManager sessionIdManager, ISessionManager sessionManager)
   {
     private readonly ISessionManager _sessionManager = sessionManager;
 
@@ -41,10 +42,11 @@ public Task InitializeAsync(TimeSpan timeout)
     /// <param name="timeout">Time to wait before timing out</param>
     private async Task GetState(TimeSpan timeout)
     {
-      Session session;
       var isBrowser = OperatingSystem.IsBrowser();
       if (isBrowser)
-        session = await _sessionManager.RetrieveSession();
+        _ = await _sessionManager.RetrieveSession();
+      else
+        _ = sessionIdManager.GetSessionId();
     }
 
     /// <summary>
diff --git a/Source/Csla.Xaml.Uwp/Properties/AssemblyInfo.cs b/Source/Csla.Xaml.Uwp/Properties/AssemblyInfo.cs
index 949f3b0ecf..ca13ace715 100644
--- a/Source/Csla.Xaml.Uwp/Properties/AssemblyInfo.cs
+++ b/Source/Csla.Xaml.Uwp/Properties/AssemblyInfo.cs
@@ -27,5 +27,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("8.2.8.0")]
-[assembly: AssemblyFileVersion("8.2.8.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("8.2.9.0")]
+[assembly: AssemblyFileVersion("8.2.9.0")]
\ No newline at end of file
diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
index bec456b1f9..e9ca967ab1 100644
--- a/Source/Directory.Build.props
+++ b/Source/Directory.Build.props
@@ -6,7 +6,7 @@
  
  <!-- Common Package Settings -->
  <PropertyGroup>
-   <Version>8.2.8.0</Version>
+   <Version>8.2.9.0</Version>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <PackageProjectUrl>https://cslanet.com</PackageProjectUrl>
    <RepositoryUrl>https://github.com/MarimerLLC/csla</RepositoryUrl>