diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
index 1d62dc6be0..1666274258 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
@@ -34,11 +34,11 @@
                 <EntityActions TItem="TenantDto" EntityActionsColumn="@EntityActionsColumn">
                     <EntityAction TItem="TenantDto"
                                   RequiredPolicy="@UpdatePolicyName"
-                                  Clicked="() => OpenEditModalAsync(context.Id)"
+                                  Clicked="() => OpenEditModalAsync(context)"
                                   Text="@L["Edit"]"></EntityAction>
                     <EntityAction TItem="TenantDto"
                                   RequiredPolicy="@ManageConnectionStringsPolicyName"
-                                  Clicked="() => OpenEditConnectionStringModalAsync(context.Id)"
+                                  Clicked="() => OpenEditConnectionStringModalAsync(context)"
                                   Text="@L["ConnectionStrings"]"></EntityAction>
                     <EntityAction TItem="TenantDto"
                                   RequiredPolicy="@ManageFeaturesPolicyName"
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
index ad33b68e5c..36b0a4ee64 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
@@ -47,15 +47,15 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
             HasManageFeaturesPermission = await AuthorizationService.IsGrantedAsync(ManageFeaturesPolicyName);
         }
 
-        protected virtual async Task OpenEditConnectionStringModalAsync(Guid id)
+        protected virtual async Task OpenEditConnectionStringModalAsync(TenantDto entity)
         {
             ManageConnectionStringValidations.ClearAll();
 
-            var tenantConnectionString = await AppService.GetDefaultConnectionStringAsync(id);
+            var tenantConnectionString = await AppService.GetDefaultConnectionStringAsync(entity.Id);
 
             TenantInfo = new TenantInfoModel
             {
-                Id = id,
+                Id = entity.Id,
                 DefaultConnectionString = tenantConnectionString,
                 UseSharedDatabase = tenantConnectionString.IsNullOrWhiteSpace()
             };