diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
index 1606e1ed..3d5c7099 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
@@ -19,7 +19,8 @@
 @inject AdminSignalRClient AdminSignalRClient;
 
 
-<AddressDetailGrid @ref="_addressGrid" 
+<AddressDetailGrid @ref="_addressGrid"
+                   DataSource="DataSource"
              Logger="_logger"
              SignalRClient="AdminSignalRClient"
              OnDataItemSaving="DataItemSaving"
@@ -60,16 +61,17 @@
     private AddressDetailGrid _addressGrid;
     private LoggerClient<AddressDetailGridComponent> _logger;
 
+    [Parameter]
+    public IList<Address> DataSource { get; set; }
+    
     public void SaveAddress(object addressOwnerToSave)
     {
         _addressGrid.SaveChangesAsync();
     }
 
-    protected override Task OnInitializedAsync()
+    protected override void OnInitialized()
     {
         _logger = new LoggerClient<AddressDetailGridComponent>(LogWriters.ToArray());
-
-        return Task.CompletedTask;
     }
 
     private void DataItemSaving(GridEditModelSavingEventArgs obj)
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index 38e51a5f..d2964571 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -20,6 +20,7 @@
 @using MessagePack.Resolvers
 @using AyCode.Core.Extensions;
 @using AyCode.Utils.Extensions
+@using TIAM.Entities.Addresses
 @using TIAMSharedUI.Shared.Components.Grids
 @layout AdminLayout
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@@ -133,7 +134,7 @@
                         <CompaniesNestedUserProductMapping CurrentCompany="(TIAM.Entities.ServiceProviders.Company)context.DataItem" KeyboardNavigationEnabled="true" />
                         </DetailRowTemplate> *@
                         <DetailRowTemplate>
-                            <AddressDetailGridComponent AddressContext="(Company)context.DataItem" KeyboardNavigationEnabled="true" />
+                            <AddressDetailGridComponent DataSource="new List<Address> { ((Company)context.DataItem).Profile.Address }" KeyboardNavigationEnabled="true" />
                         </DetailRowTemplate>
                         <EditFormTemplate Context="EditFormContext">
                             @{
diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
index 2373bf44..2025d244 100644
--- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
+++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
@@ -81,7 +81,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
         {
             await base.OnAfterRenderAsync(firstRender);
 
-            if (firstRender) RefreshDataSourceAsync().Forget();
+            if (firstRender && DataSource == null) RefreshDataSourceAsync().Forget();
         }
 
         public Task AddDataItem(TDataItem dataItem) => PostDataToServerAsync(dataItem, AddMessageTag);