diff --git a/src/LinkDotNet.Blog.Web/Features/Home/Components/Footer.razor b/src/LinkDotNet.Blog.Web/Features/Home/Components/Footer.razor
index e140578a..549dd9c3 100644
--- a/src/LinkDotNet.Blog.Web/Features/Home/Components/Footer.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Home/Components/Footer.razor
@@ -9,7 +9,7 @@
     @if (SupportConfiguration.Value.ShowInFooter)
     {
         <div class="pb-2" style="display:flex;justify-content:center">
-            <LinkDotNet.Blog.Web.Features.SupportMe.Components.DonationSection />
+            <DonationSection />
         </div>
     }
 </footer>
diff --git a/src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor b/src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor
index 13a8546d..60ab04cb 100644
--- a/src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor
@@ -13,7 +13,7 @@
             <SocialAccounts Social="@Social.Value"></SocialAccounts>
             @if (SupportConfiguration.Value.ShowUnderIntroduction)
             {
-                <LinkDotNet.Blog.Web.Features.SupportMe.Components.DonationSection />
+                <DonationSection />
             }
         </div>
     </div>
diff --git a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
index 520c7f88..9af73b20 100644
--- a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
@@ -1,11 +1,11 @@
 @page "/blogPost/{blogPostId}/{slug?}"
 @using System.Text
-@using LinkDotNet.Blog.Web.Features.SupportMe.Components
 @using Markdig
 @using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
 @using LinkDotNet.Blog.Web.Features.Services
 @using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components
+@using LinkDotNet.Blog.Web.Features.SupportMe.Components
 @inject IRepository<BlogPost> BlogPostRepository
 @inject IRepository<ShortCode> ShortCodeRepository
 @inject IJSRuntime JsRuntime
@@ -85,7 +85,7 @@ else if (BlogPost is not null)
 			</div>
             @if (SupportConfiguration.Value.ShowUnderBlogPost)
             {
-                <LinkDotNet.Blog.Web.Features.SupportMe.Components.DonationSection />   
+                <DonationSection />   
             }
             @if (AppConfiguration.Value.ShowSimilarPosts)
 			{
diff --git a/src/LinkDotNet.Blog.Web/Features/SupportMe/SupportMePage.razor b/src/LinkDotNet.Blog.Web/Features/SupportMe/SupportMePage.razor
index 74c96fcb..2105b5e5 100644
--- a/src/LinkDotNet.Blog.Web/Features/SupportMe/SupportMePage.razor
+++ b/src/LinkDotNet.Blog.Web/Features/SupportMe/SupportMePage.razor
@@ -5,7 +5,7 @@
 @inject IOptions<ProfileInformation> ProfileInformation
 @namespace LinkDotNet.Blog.Web.Features.SupportMe.Components
 
-@if (SupportConfiguration.Value.ShowSupportMePage)
+@if (SupportConfiguration.Value.ShowSupportMePage && SupportConfiguration.Value.SupportMePageDescription is not null)
 {
     <OgData Title="@("Support Me - " + ProfileInformation.Value.Name)"
             Description="@("Support Me," + ProfileInformation.Value.Name)"