diff --git a/BTCPayServer/Controllers/ServerController.Extensions.cs b/BTCPayServer/Controllers/ServerController.Extensions.cs
index 63d35074c..26a426799 100644
--- a/BTCPayServer/Controllers/ServerController.Extensions.cs
+++ b/BTCPayServer/Controllers/ServerController.Extensions.cs
@@ -16,12 +16,26 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> ListExtensions(
             [FromServices] ExtensionService extensionService,
             [FromServices] BTCPayServerOptions btcPayServerOptions,
-            string remote = "kukks/btcpayserver-extensions")
+            string remote = "btcpayserver/btcpayserver-extensions")
         {
+            IEnumerable<ExtensionService.AvailableExtension> availableExtensions;
+            try
+            {
+                availableExtensions = await extensionService.GetRemoteExtensions(remote);
+            }
+            catch (Exception e)
+            {
+                TempData.SetStatusMessageModel(new StatusMessageModel()
+                {
+                    Severity = StatusMessageModel.StatusSeverity.Error,
+                    Message = "The remote could not be reached"
+                });
+                availableExtensions = Array.Empty<ExtensionService.AvailableExtension>();
+            }
             var res = new ListExtensionsViewModel()
             {
                 Installed = extensionService.LoadedExtensions,
-                Available = await extensionService.GetRemoteExtensions(remote),
+                Available = availableExtensions,
                 Remote = remote,
                 Commands = extensionService.GetPendingCommands(),
                 CanShowRestart = btcPayServerOptions.DockerDeployment
@@ -83,7 +97,7 @@ namespace BTCPayServer.Controllers
             {
                 TempData.SetStatusMessageModel(new StatusMessageModel()
                 {
-                    Message = e.Message, Severity = StatusMessageModel.StatusSeverity.Error
+                    Message = "The extension could not be downloaded. Try again later.", Severity = StatusMessageModel.StatusSeverity.Error
                 });
             }
 
diff --git a/BTCPayServer/Views/Server/ListExtensions.cshtml b/BTCPayServer/Views/Server/ListExtensions.cshtml
index 394c4bd27..4a24a2cb8 100644
--- a/BTCPayServer/Views/Server/ListExtensions.cshtml
+++ b/BTCPayServer/Views/Server/ListExtensions.cshtml
@@ -19,7 +19,6 @@
 }
 <partial name="_StatusMessage"/>
 
-
 @if (Model.Installed.Any())
 {
     <h4>Installed Extensions</h4>