diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index 9d0ca540..087e1da6 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -134,7 +134,13 @@
                         <CompaniesNestedUserProductMapping CurrentCompany="(TIAM.Entities.ServiceProviders.Company)context.DataItem" KeyboardNavigationEnabled="true" />
                         </DetailRowTemplate> *@
                         <DetailRowTemplate>
-                            <AddressDetailGridComponent DataSource="new List<Address> { ((Company)context.DataItem).Profile.Address }" OnAddressChanged="AddressChanged" KeyboardNavigationEnabled="true" />
+
+
+                            @{
+                                List<Address> RowData = new List<Address> { ((Company)context.DataItem).Profile.Address };
+                            }
+
+                            <AddressDetailGridComponent DataSource="RowData" OnAddressChanged="AddressChanged" KeyboardNavigationEnabled="true" />
                         </DetailRowTemplate>
                         <EditFormTemplate Context="EditFormContext">
                             @{