diff --git a/SecureBank/Components/Pages/User/AccountDetails.razor b/SecureBank/Components/Pages/User/AccountDetails.razor
index 61ff21c..95edd8f 100644
--- a/SecureBank/Components/Pages/User/AccountDetails.razor
+++ b/SecureBank/Components/Pages/User/AccountDetails.razor
@@ -170,7 +170,7 @@ else
 
             StateHasChanged();
 
-            if (_authLoaded)
+            if (_authLoaded && _claims is not null)
             {
                 APIResponse<IEnumerable<AccountResponse>> dataResponse = await _accountsService.GetAccounts(id: _claims.AccountId);
                 if (dataResponse.Status == ResponseStatus.Ok && dataResponse.Data.Count() == 1)
diff --git a/SecureBank/Components/Pages/User/Dashboard.razor b/SecureBank/Components/Pages/User/Dashboard.razor
index b6838d7..a94f641 100644
--- a/SecureBank/Components/Pages/User/Dashboard.razor
+++ b/SecureBank/Components/Pages/User/Dashboard.razor
@@ -123,7 +123,7 @@ else
 
             StateHasChanged();
 
-            if (_authLoaded)
+            if (_authLoaded && _claims is not null)
             {
                 APIResponse<decimal> balanceResponse = await _balanceService.GetBalance();
                 if (balanceResponse.Status == ResponseStatus.Ok)
diff --git a/SecureBank/SecureBank.csproj b/SecureBank/SecureBank.csproj
index fd2f673..e362467 100644
--- a/SecureBank/SecureBank.csproj
+++ b/SecureBank/SecureBank.csproj
@@ -31,12 +31,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SecureBank.API.Encryption\SecureBank.API.Encryption.csproj" />
     <ProjectReference Include="..\SecureBank.API\SecureBank.API.Authentication\SecureBank.API.Authentication.csproj" />
     <ProjectReference Include="..\SecureBank.API\SecureBank.API.Controllers\SecureBank.API.Controllers.csproj" />
     <ProjectReference Include="..\SecureBank.API\SecureBank.API.Encryption\SecureBank.API.Encryption.csproj" />
     <ProjectReference Include="..\SecureBank.API\SecureBank.API.Services\SecureBank.API.Services.csproj" />
-    <ProjectReference Include="..\SecureBank.API\SecureBank.API.Token\SecureBank.API.Authentication.csproj" />
     <ProjectReference Include="..\SecureBank.Authentication\SecureBank.Authentication.csproj" />
     <ProjectReference Include="..\SecureBank.Common\SecureBank.Common.csproj" />
     <ProjectReference Include="..\SecureBank.Database\SecureBank.Database.csproj" />