diff --git a/BTCPayServer/Views/Error/_LayoutError.cshtml b/BTCPayServer/Views/Error/_LayoutError.cshtml
index c517459d1..bf3da3a61 100644
--- a/BTCPayServer/Views/Error/_LayoutError.cshtml
+++ b/BTCPayServer/Views/Error/_LayoutError.cshtml
@@ -110,7 +110,7 @@
                 <div class="row">
                     <div class="col-12">
                         <hr class="primary ml-0" style="margin:20px auto;" />
-                        @await Html.PartialAsync("_BTCPaySupporters", new ViewDataDictionary(ViewData) { { "Justify", "center" } })
+                        <partial name="_BTCPaySupporters"/>
                     </div>
                 </div>
             </div>
diff --git a/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml b/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml
index ad17f4561..658d9e497 100644
--- a/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml
+++ b/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml
@@ -1,8 +1,14 @@
-<h3 class="lead-h">BTCPayServer Supporters <a href="https://foundation.btcpayserver.org/" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a></h3>
-<div class="row justify-content-@(ViewData["Justify"] ?? "start")">
+@model bool
+<h3 class="lead-h text-center">
+    BTCPayServer Supporters
+    <a href="https://foundation.btcpayserver.org/" target="_blank">
+        <span class="fa fa-question-circle-o" title="More information..."></span>
+    </a>
+</h3>
+<div class="row justify-content-center">
     <div class="figure p-3">
         <a href="https://twitter.com/sqcrypto" target="_blank">
-            <img src="~/img/squarecrypto.svg" alt="Sponsor Square Crypto" height="75" asp-append-version="true" />
+            <img src="~/img/squarecrypto.svg" alt="Sponsor Square Crypto" height="75" asp-append-version="true"/>
         </a>
         <div class="figure-caption text-center">
             <a href="https://twitter.com/sqcrypto" class="text-muted small" target="_blank">Square Crypto</a>
@@ -10,7 +16,7 @@
     </div>
     <div class="figure p-3">
         <a href="https://www.btse.com" target="_blank">
-            <img src="~/img/btse.svg" alt="Sponsor BTSE" height="75" asp-append-version="true" />
+            <img src="~/img/btse.svg" alt="Sponsor BTSE" height="75" asp-append-version="true"/>
         </a>
         <div class="figure-caption text-center">
             <a href="https://www.btse.com/" class="text-muted small" target="_blank">BTSE</a>
@@ -18,7 +24,7 @@
     </div>
     <div class="figure p-3">
         <a href="https://www.dglab.com/en/" target="_blank">
-            <img src="~/img/dglab.svg" alt="Sponsor DG lab" height="75" asp-append-version="true" />
+            <img src="~/img/dglab.svg" alt="Sponsor DG lab" height="75" asp-append-version="true"/>
         </a>
         <div class="figure-caption text-center">
             <a href="https://www.dglab.com/en/" class="text-muted small" target="_blank">DG Lab</a>
@@ -34,26 +40,36 @@
     </div>
     <div class="figure p-3">
         <a href="https://acinq.co/" target="_blank">
-            <img src="~/img/acinq-logo.svg" alt="Sponsor ACINQ" height="75" asp-append-version="true" />
+            <img src="~/img/acinq-logo.svg" alt="Sponsor ACINQ" height="75" asp-append-version="true"/>
         </a>
         <div class="figure-caption text-center">
             <a href="https://acinq.co/" class="text-muted small" target="_blank">ACINQ</a>
         </div>
     </div>
-    <div class="figure p-3">
-        <a href="https://lunanode.com/" target="_blank">
-            <img src="~/img/lunanode.svg" alt="Sponsor LunaNode" height="75" asp-append-version="true" />
-        </a>
-        <div class="figure-caption text-center">
-            <a href="https://lunanode.com/" class="text-muted small" target="_blank">LunaNode</a>
-        </div>
-    </div>
-    <div class="figure p-3">
-        <a href="https://walletofsatoshi.com/" target="_blank">
-            <img src="~/img/walletofsatoshi.svg" alt="Sponsor Wallet of Satoshi" height="75" asp-append-version="true" />
-        </a>
-        <div class="figure-caption text-center">
-            <a href="https://walletofsatoshi.com/" class="text-muted small" target="_blank">Wallet of Satoshi</a>
-        </div>
-    </div>
+</div>
+<div class="row justify-content-center">
+
+    @if (Model)
+    {
+        <div class="figure p-3">
+            <a href="https://lunanode.com/" target="_blank">
+                <img src="~/img/lunanode.svg" alt="Sponsor LunaNode" height="75" asp-append-version="true"/>
+            </a>
+            <div class="figure-caption text-center">
+                <a href="https://lunanode.com/" class="text-muted small" target="_blank">LunaNode</a>
+            </div>
+        </div>
+        <div class="figure p-3">
+            <a href="https://walletofsatoshi.com/" target="_blank">
+                <img src="~/img/walletofsatoshi.svg" alt="Sponsor Wallet of Satoshi" height="75" asp-append-version="true"/>
+            </a>
+            <div class="figure-caption text-center">
+                <a href="https://walletofsatoshi.com/" class="text-muted small" target="_blank">Wallet of Satoshi</a>
+            </div>
+        </div>
+    }
+    else
+    {
+        <a href="https://foundation.btcpayserver.org" target="_blank" class="btn btn-link text-center col-12">View all supporters</a>
+    }
 </div>
diff --git a/BTCPayServer/Views/Shared/_LayoutWelcome.cshtml b/BTCPayServer/Views/Shared/_LayoutWelcome.cshtml
index b0223abb1..7d10b9651 100644
--- a/BTCPayServer/Views/Shared/_LayoutWelcome.cshtml
+++ b/BTCPayServer/Views/Shared/_LayoutWelcome.cshtml
@@ -102,7 +102,7 @@
                 <div class="col-md-7 order-md-1 order-2">
                     <hr class="primary ml-0" style="margin:30px auto;">
                     <p class="lead-login" style="margin-bottom:69px;">BTCPay Server is a self-hosted, open-source cryptocurrency payment processor. It is secure, private, censorship-resistant and free.</p>
-                    @await Html.PartialAsync("_BTCPaySupporters")
+                    <partial name="_BTCPaySupporters"/>
                 </div>
                 <div class="col-md-5 order-md-2 order-1">
                     @RenderBody()