diff --git a/BTCPayServer/Models/AppViewModels/ViewCrowdfundViewModel.cs b/BTCPayServer/Models/AppViewModels/ViewCrowdfundViewModel.cs
index d0b3d89c5..0477cf3c3 100644
--- a/BTCPayServer/Models/AppViewModels/ViewCrowdfundViewModel.cs
+++ b/BTCPayServer/Models/AppViewModels/ViewCrowdfundViewModel.cs
@@ -70,7 +70,7 @@ namespace BTCPayServer.Models.AppViewModels
 
         public bool Started => !StartDate.HasValue || DateTime.Now.ToUniversalTime() > StartDate;
 
-        public bool Ended => !EndDate.HasValue || DateTime.Now.ToUniversalTime() > EndDate;
+        public bool Ended => EndDate.HasValue && DateTime.Now.ToUniversalTime() > EndDate;
         public bool DisplayPerksRanking { get; set; }
         public bool Enabled { get; set; }
         public string ResetEvery { get; set; }
diff --git a/BTCPayServer/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml b/BTCPayServer/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml
index c1731b2d7..6bb6bb74e 100644
--- a/BTCPayServer/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml
+++ b/BTCPayServer/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml
@@ -87,7 +87,7 @@
                         </h5>
                         <h5 class="text-muted">Contributors</h5>
                     </div>
-                    @if (Model.Started && !Model.Ended)
+                    @if (Model.Started && !Model.Ended && Model.EndDate.HasValue)
                     {
                         <div class="col-sm">
                             <h5>
diff --git a/BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml b/BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml
index 44ebe3a40..a0785c307 100644
--- a/BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml
+++ b/BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml
@@ -46,6 +46,14 @@
     {
         <noscript>
             @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml", Model)
+
+            <style>
+                /* Hide the below canvas or else user will be staring "Loading..." text when JS is disabled */
+                #fireworks,
+                #app {
+                    display:none;
+                }
+            </style>
         </noscript>
 
         if (Model.AnimationsEnabled)