diff --git a/src/aoWebWallet/Pages/Tokens.razor.cs b/src/aoWebWallet/Pages/Tokens.razor.cs
index b51bbca..51a579d 100644
--- a/src/aoWebWallet/Pages/Tokens.razor.cs
+++ b/src/aoWebWallet/Pages/Tokens.razor.cs
@@ -9,11 +9,14 @@ protected override void OnInitialized()
             base.OnInitialized();
         }
 
-        protected override async Task LoadDataAsync()
+        protected override async Task OnAfterRenderAsync(bool firstRender)
         {
-            await dataService.LoadTokenList();
+            if (firstRender)
+            {
+                await dataService.LoadTokenList();
+            }
 
-            await base.LoadDataAsync();
+            await base.OnAfterRenderAsync(firstRender);
         }
 
     }