diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index 4d7b6f59..5c53f36f 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -545,13 +545,16 @@
             url = PageState.Alias.Path;
         }
 
-        if (PageState.Runtime == Shared.Runtime.Hybrid && PageState.User != null)
+        if (PageState.Runtime == Shared.Runtime.Hybrid)
         {
-            // hybrid apps utilize an interactive logout
-            await UserService.LogoutUserAsync(PageState.User);
-            var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
-            authstateprovider.NotifyAuthenticationChanged();
-            NavigationManager.NavigateTo(url, true);
+            if (PageState.User != null)
+            {
+                // hybrid apps utilize an interactive logout
+                await UserService.LogoutUserAsync(PageState.User);
+                var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
+                authstateprovider.NotifyAuthenticationChanged();
+                NavigationManager.NavigateTo(url, true);
+            }
         }
         else
         {