diff --git a/Hcs.WebApp/Components/Pages/Registry/Common.razor b/Hcs.WebApp/Components/Pages/Registry/Common.razor
index 05669b2..e4e7440 100644
--- a/Hcs.WebApp/Components/Pages/Registry/Common.razor
+++ b/Hcs.WebApp/Components/Pages/Registry/Common.razor
@@ -173,20 +173,22 @@
     {
         if (campaign.Type == Campaign.CampaignType.ExportCommonRegistryElements_15_7_0_1)
         {
-            InvokeAsync(() => Task.Run(RefreshRegistries));
+            Task.Run(RefreshRegistries);
         }
     }
 
     async Task RefreshRegistries()
     {
-        ChangeState(CommonPageState.Loading);
+        await InvokeAsync(() => ChangeState(CommonPageState.Loading));
 
-        registries = await RegistryService.GetAllRegistriesAsync(true);
+        var refreshedRegistries = await RegistryService.GetAllRegistriesAsync(true);
 
-        if (state != CommonPageState.OperationWaiting)
+        await InvokeAsync(() =>
         {
-            ChangeState(CommonPageState.Idle);
-        }
+            registries = refreshedRegistries;
+
+            ChangeState(CommonPageState.Loading);
+        });
     }
 
     public void Dispose()