diff --git a/modules/permission-management/Volo.Abp.PermissionManagement.slnx b/modules/permission-management/Volo.Abp.PermissionManagement.slnx
index fbfc4f71b8..b1220e4a26 100644
--- a/modules/permission-management/Volo.Abp.PermissionManagement.slnx
+++ b/modules/permission-management/Volo.Abp.PermissionManagement.slnx
@@ -2,6 +2,9 @@
   <Folder Name="/src/">
     <Project Path="src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.csproj" />
     <Project Path="src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.csproj" />
+    <Project Path="src/Volo.Abp.PermissionManagement.Blazor.MudBlazor.Server/Volo.Abp.PermissionManagement.Blazor.MudBlazor.Server.csproj" />
+    <Project Path="src/Volo.Abp.PermissionManagement.Blazor.MudBlazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.MudBlazor.WebAssembly.csproj" />
+    <Project Path="src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Volo.Abp.PermissionManagement.Blazor.MudBlazor.csproj" />
     <Project Path="src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj" />
     <Project Path="src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj" />
     <Project Path="src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj" />
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor
index 0a2ae144bc..4e3cf82fd0 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor
@@ -1,4 +1,6 @@
 @inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
+@using global::MudBlazor
+@using JetBrains.Annotations
 @using MudBlazor
 @using Volo.Abp.PermissionManagement.Localization
 
@@ -10,7 +12,7 @@
         <MudGrid Class="mb-2">
             <MudItem xs="12" sm="8">
                 <MudTextField Value="@_permissionGroupSearchText"
-                             ValueChanged="@OnPermissionGroupSearchTextChangedAsync"
+                             ValueChanged="@(async ([CanBeNull] string b) => await OnPermissionGroupSearchTextChangedAsync(b))"
                              Label="@L["Search"]"
                              Variant="Variant.Outlined"
                              Adornment="Adornment.Start"
@@ -20,9 +22,9 @@
             <MudItem xs="12" sm="4" Class="d-flex align-items-center">
                 <MudCheckBox T="bool"
                             Disabled="@_selectAllDisabled"
-                            Checked="@GrantAll"
+                            Value="@GrantAll"
                             Indeterminate="@GrantAny"
-                            CheckedChanged="@GrantAllAsync"
+                            ValueChanged="@(async (bool b) => await GrantAllAsync(b))"
                             Label="@L["SelectAllInAllTabs"]" />
             </MudItem>
         </MudGrid>
@@ -42,10 +44,10 @@
                         <MudTabPanel Text="@($"{group.DisplayName} ({group.Permissions.Count(x => x.IsGranted)})")">
                             <div style="height: 500px; overflow-y: auto; padding: 8px;">
                                 <MudCheckBox 
-                                            TValue="bool"
-                                             Disabled="@(IsPermissionGroupDisabled(group))"
-                                            Checked="@(group.Permissions.All(x => x.IsGranted))"
-                                            CheckedChanged="@(b => GroupGrantAllChanged(b, group))"
+                                            T="bool"
+                                            Disabled="@(IsPermissionGroupDisabled(group))"
+                                            Value="@(group.Permissions.All(x => x.IsGranted))"
+                                            ValueChanged="@(async (bool b) => await GroupGrantAllChanged(b, group))"
                                             Label="@L["SelectAllInThisTab"]" />
                                 <MudDivider Class="my-2" />
 
@@ -56,8 +58,8 @@
                                         <MudCheckBox
                                                     TValue="bool" 
                                                     Disabled="@(IsDisabledPermission(permission))"
-                                                    Checked="@permission.IsGranted"
-                                                    CheckedChanged="@(async (b) => await PermissionChanged(b, group, permission))"
+                                                    Value="@permission.IsGranted"
+                                                    ValueChanged="@(async (bool b) => await PermissionChanged(b, group, permission))"
                                                     Label="@GetShownName(permission)" />
                                     </div>
                                 }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
index 5b21c749d7..48edbeedfc 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
@@ -1,5 +1,4 @@
-@using MudBlazor
-@using Volo.Abp.PermissionManagement.Localization
+@using global::MudBlazor
 @inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
 
 <MudDialog @bind-IsVisible="@_isVisible" Options="@(new DialogOptions { MaxWidth = MaxWidth.ExtraLarge, FullWidth = true })" CloseOnEscapeKey="true">
@@ -26,10 +25,10 @@
                     <TemplateColumn Title="@L["Actions"]" Sortable="false" Style="width: 150px;">
                         <CellTemplate>
                             <MudMenu Icon="@Icons.Material.Filled.MoreVert">
-                                <MudMenuItem OnClick="@(() => OpenEditDialogAsync(context))">
+                                <MudMenuItem OnClick="@(() => OpenEditDialogAsync(context.Item))">
                                     @L["Edit"]
                                 </MudMenuItem>
-                                <MudMenuItem OnClick="@(() => DeleteResourcePermissionAsync(context))">
+                                <MudMenuItem OnClick="@(() => DeleteResourcePermissionAsync(context.Item))">
                                     @L["Delete"]
                                 </MudMenuItem>
                             </MudMenu>
@@ -37,17 +36,17 @@
                     </TemplateColumn>
                     <PropertyColumn Property="x => x.ProviderName" Title="@L["ResourcePermissionTarget"]" Sortable="false">
                         <CellTemplate>
-                            <MudTooltip Text="@context.ProviderNameDisplayName">
+                            <MudTooltip Text="@context.Item.ProviderNameDisplayName">
                                 <MudChip Size="Size.Small" Color="Color.Default" Class="me-1 mb-1">
-                                    @context.ProviderName
+                                    @context.Item.ProviderName
                                 </MudChip>
                             </MudTooltip>
-                            @context.ProviderDisplayName
+                            @context.Item.ProviderDisplayName
                         </CellTemplate>
                     </PropertyColumn>
                     <TemplateColumn Title="@L["ResourcePermissionPermissions"]" Sortable="false">
                         <CellTemplate>
-                            @foreach (var permission in context.Permissions)
+                            @foreach (var permission in context.Item.Permissions)
                             {
                                 <MudChip Size="Size.Small" Color="Color.Default" Class="me-1 mb-1">
                                     @permission.DisplayName
@@ -93,7 +92,7 @@
                 <MudRadioGroup T="string" SelectedOption="@CurrentLookupService" SelectedOptionChanged="@OnLookupServiceCheckedValueChanged">
                     @foreach (var keyLookupService in ResourceProviderKeyLookupServices)
                     {
-                        <MudRadio Option="@keyLookupService.Name">@keyLookupService.DisplayName</MudRadio>
+                        <MudRadio T="string" Option="@keyLookupService.Name">@keyLookupService.DisplayName</MudRadio>
                     }
                 </MudRadioGroup>
                 <MudAutocomplete T="SearchProviderKeyInfo"
@@ -107,13 +106,13 @@
                                RequiredError="@L["ThisFieldIsRequired"]"
                                Class="mt-2" />
                 <MudText Typo="Typo.subtitle1" Class="mb-2 mt-4">@L["ResourcePermissionPermissions"]</MudText>
-                <MudSwitch @bind-Checked="@_grantAllCreate" 
-                          CheckedChanged="@(async (b) => await GrantAllCreateAsync(b))"
+                <MudSwitch T="bool" Checked="@_grantAllCreate" 
+                          CheckedChanged="@(async (bool b) => await GrantAllCreateAsync(b))"
                           Label="@L["GrantAllResourcePermissions"]" />
                 <div class="mt-2">
                     @foreach (var permission in CreateEntity.Permissions)
                     {
-                        <MudCheckBox @bind-Checked="@permission.IsGranted" 
+                        <MudCheckBox T="bool" @bind-Checked="@permission.IsGranted" 
                                     Label="@permission.DisplayName" />
                     }
                 </div>
@@ -136,13 +135,13 @@
         <DialogContent>
             <MudForm @ref="@_editFormRef" Model="@EditEntity">
                 <MudText Typo="Typo.subtitle1" Class="mb-2">@L["ResourcePermissionPermissions"]</MudText>
-                <MudSwitch @bind-Checked="@_grantAllEdit" 
-                          CheckedChanged="@(async (b) => await GrantAllEditAsync(b))"
+                <MudSwitch T="bool" Checked="@_grantAllEdit" 
+                          CheckedChanged="@(async (bool b) => await GrantAllEditAsync(b))"
                           Label="@L["GrantAllResourcePermissions"]" />
                 <div class="mt-2">
                     @foreach (var permission in EditEntity.Permissions)
                     {
-                        <MudCheckBox @bind-Checked="@permission.IsGranted" 
+                        <MudCheckBox T="bool" @bind-Checked="@permission.IsGranted" 
                                     Label="@permission.DisplayName" />
                     }
                 </div>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs
index fbdffa2ac2..1df024471e 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
@@ -225,7 +226,13 @@ public partial class ResourcePermissionManagementModal
 
     protected virtual async Task CreateResourcePermissionAsync()
     {
-        if (_createFormRef != null && !await _createFormRef.Validate())
+        if (_createFormRef == null)
+        {
+            return;
+        }
+
+        await _createFormRef.Validate();
+        if (!_createFormRef.IsValid)
         {
             return;
         }
@@ -254,11 +261,17 @@ public partial class ResourcePermissionManagementModal
 
     protected virtual async Task UpdateResourcePermissionAsync()
     {
-        if (_editFormRef != null && !await _editFormRef.Validate())
+        if (_editFormRef == null)
         {
             return;
         }
 
+        await _editFormRef.Validate();
+        if (!_editFormRef.IsValid)
+        {
+            return;
+        }
+        
         await PermissionAppService.UpdateResourceAsync(
             ResourceName!,
             ResourceKey!,