diff --git a/Moonlight/App/Services/Sessions/SessionClientService.cs b/Moonlight/App/Services/Sessions/SessionClientService.cs
index c152ffda..e7040ba4 100644
--- a/Moonlight/App/Services/Sessions/SessionClientService.cs
+++ b/Moonlight/App/Services/Sessions/SessionClientService.cs
@@ -11,6 +11,8 @@ public class SessionClientService
     public readonly Guid Uuid = Guid.NewGuid();
     public readonly DateTime CreateTimestamp = DateTime.UtcNow;
     public User? User { get; private set; }
+    public string Ip { get; private set; } = "N/A";
+    public string Device { get; private set; } = "N/A";
 
     public readonly IdentityService IdentityService;
     public readonly AlertService AlertService;
@@ -39,6 +41,8 @@ public class SessionClientService
     public async Task Start()
     {
         User = await IdentityService.Get();
+        Ip = IdentityService.GetIp();
+        Device = IdentityService.GetDevice();
 
         if (User != null) // Track users last visit
         {
diff --git a/Moonlight/Shared/Views/Admin/Users/Sessions.razor b/Moonlight/Shared/Views/Admin/Users/Sessions.razor
index 4d793cc5..a9df5cf1 100644
--- a/Moonlight/Shared/Views/Admin/Users/Sessions.razor
+++ b/Moonlight/Shared/Views/Admin/Users/Sessions.razor
@@ -60,13 +60,13 @@
                         </Column>
                         <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("IP"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
                             <Template>
-                                @(context.IdentityService.GetIp())
+                                @(context.Ip)
                             </Template>
                         </Column>
                         <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("URL"))" Field="@(x => x.NavigationManager.Uri)" Sortable="true" Filterable="true" Width="10%"/>
                         <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Device"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
                             <Template>
-                                @(context.IdentityService.GetDevice())
+                                @(context.Device)
                             </Template>
                         </Column>
                         <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Time"))" Field="@(x => x.CreateTimestamp)" Sortable="true" Filterable="true" Width="10%">