diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppComponentBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppComponentBase.cs
index 742e814f5c..5529d54bba 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppComponentBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppComponentBase.cs
@@ -201,8 +201,8 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
         if (disposing)
         {
             await PrerenderStateService.DisposeAsync();
-            cts.Cancel();
-            cts.Dispose();
+            cts?.Cancel();
+            cts?.Dispose();
         }
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Identity/IdentityHeader.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Identity/IdentityHeader.razor.cs
index 7e44418683..b3d60f3945 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Identity/IdentityHeader.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Identity/IdentityHeader.razor.cs
@@ -54,6 +54,6 @@ private async Task OnCultureChanged(string? cultureName)
 
     public void Dispose()
     {
-        unsubscribeUpdateBackLink();
+        unsubscribeUpdateBackLink?.Invoke();
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/MainHeader.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/MainHeader.razor.cs
index 7ac72331bf..76938fa6ee 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/MainHeader.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/MainHeader.razor.cs
@@ -28,6 +28,6 @@ protected override async ValueTask DisposeAsync(bool disposing)
     {
         await base.DisposeAsync(disposing);
 
-        unsubscribePageTitleChanged();
+        unsubscribePageTitleChanged?.Invoke();
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/UserMenu.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/UserMenu.razor.cs
index 585ece3f21..706041cc5b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/UserMenu.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/UserMenu.razor.cs
@@ -68,6 +68,6 @@ protected override async ValueTask DisposeAsync(bool disposing)
     {
         await base.DisposeAsync(disposing);
 
-        unsubscribeUerDataUpdated();
+        unsubscribeUerDataUpdated?.Invoke();
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs
index ae0c352dcf..145691dd8d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs
@@ -125,7 +125,7 @@ public void Dispose()
 
         authManager.AuthenticationStateChanged -= AuthenticationStateChanged;
 
-        unsubscribeThemeChange();
-        unsubscribeCultureChange();
+        unsubscribeThemeChange?.Invoke();
+        unsubscribeCultureChange?.Invoke();
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
index 422358cca6..0f3ae553f4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
@@ -62,7 +62,7 @@
                 <BitStack HorizontalAlign="BitAlignment.Center">
                     <BitText Typography="BitTypography.H5">bit Boilerplate</BitText>
                     <BitText Typography="BitTypography.Body1" Align="BitTextAlign.Center">
-                        @Localizer[nameof(AppStrings.BitBoilerplateMessage)]
+                        @Localizer[nameof(AppStrings.BitProjectTemplateMessage)]
                     </BitText>
                     <BitButton Variant="BitVariant.Outline" Href="https://youtube.com">
                         @Localizer[nameof(AppStrings.WatchVideo)]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs
index 35a68e9569..06f8b50d56 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs
@@ -182,6 +182,6 @@ private async Task SendTfaToken()
 
     public void Dispose()
     {
-        unsubscribeIdentityHeaderBackLinkClicked();
+        unsubscribeIdentityHeaderBackLinkClicked?.Invoke();
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
index 30bf2c2c07..a03aca402b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
@@ -567,7 +567,7 @@
     <data name="BitBlazorUIMessage" xml:space="preserve">
     <value>مجموعه ای از کمپوننتهای کارا، ساده و زیبای بلیزری</value>
   </data>
-    <data name="BitBoilerplateMessage" xml:space="preserve">
+    <data name="BitProjectTemplateMessage" xml:space="preserve">
     <value>تمپلیت پروژه ای فول امکانات که همه جا کار میکند</value>
   </data>
     <data name="InvalidConfirmationTokenMessage" xml:space="preserve">
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
index 4977287890..a1d4baf560 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
@@ -564,7 +564,7 @@
     <data name="BitBlazorUIMessage" xml:space="preserve">
     <value>Krachtige, eenvoudig aan te passen en mooie Blazor-componenten</value>
   </data>
-    <data name="BitBoilerplateMessage" xml:space="preserve">
+    <data name="BitProjectTemplateMessage" xml:space="preserve">
     <value>Een veelzijdige .NET-projectsjabloon die overal naadloos werkt</value>
   </data>
   <data name="DescriptionMetaTagValue" xml:space="preserve">
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
index ed11bda4cb..4380487a16 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
@@ -564,7 +564,7 @@
     <data name="BitBlazorUIMessage" xml:space="preserve">
     <value>A set of performant, easy-to-customize and beautiful Blazor components</value>
   </data>
-    <data name="BitBoilerplateMessage" xml:space="preserve">
+    <data name="BitProjectTemplateMessage" xml:space="preserve">
     <value>A feature-rich .NET project template that works everywhere seamlessly</value>
   </data>
     <data name="DescriptionMetaTagValue" xml:space="preserve">