diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index b5ee61603..0cdbb1a49 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -193,19 +193,17 @@ namespace BTCPayServer.Controllers
             var options = (await relevant.GetSupportedPaymentMethods(invoice.StoreData)).Where(id => pmis.Contains(id)).ToList();
             if (!options.Any())
             {
-                TempData.SetStatusMessageModel(new StatusMessageModel()
-                {
-                    Severity = StatusMessageModel.StatusSeverity.Error,
-                    Message = "There were no payment methods available to provide refunds with for this invoice."
-                });
-                return RedirectToAction(nameof(Invoice), new { invoiceId });
+                var vm = new RefundModel { Title = "No matching payment method" };
+                ModelState.AddModelError(nameof(vm.AvailablePaymentMethods), 
+                    "There are no payment methods available to provide refunds with for this invoice.");
+                return View("_RefundModal", vm);
             }
 
             var defaultRefund = invoice.Payments
                 .Select(p => p.GetBlob(_NetworkProvider))
                 .Select(p => p?.GetPaymentMethodId())
                 .FirstOrDefault(p => p != null && options.Contains(p));
-            // TODO: What if no option?
+
             var refund = new RefundModel
             {
                 Title = "Payment method",
diff --git a/BTCPayServer/Views/UIInvoice/_RefundModal.cshtml b/BTCPayServer/Views/UIInvoice/_RefundModal.cshtml
index 2610dace4..8c98fb804 100644
--- a/BTCPayServer/Views/UIInvoice/_RefundModal.cshtml
+++ b/BTCPayServer/Views/UIInvoice/_RefundModal.cshtml
@@ -13,18 +13,28 @@
     
     <h5 class="mb-3">@Model.Title</h5>
 
+    <partial name="_StatusMessage" />
+    
+    @if (!ViewContext.ModelState.IsValid)
+    {
+        <div asp-validation-summary="All" class="text-danger"></div>
+    }
+
     @switch (Model.RefundStep)
     {
         case RefundSteps.SelectPaymentMethod:
-            <div class="form-group">
-                <label asp-for="SelectedPaymentMethod" class="form-label"></label>
-                <select asp-items="Model.AvailablePaymentMethods" asp-for="SelectedPaymentMethod" class="form-select"></select>
-                <span asp-validation-for="SelectedPaymentMethod" class="text-danger"></span>
-            </div>
+            if (Model.AvailablePaymentMethods != null && Model.AvailablePaymentMethods.Any())
+            {
+                <div class="form-group">
+                    <label asp-for="SelectedPaymentMethod" class="form-label"></label>
+                    <select asp-items="Model.AvailablePaymentMethods" asp-for="SelectedPaymentMethod" class="form-select"></select>
+                    <span asp-validation-for="SelectedPaymentMethod" class="text-danger"></span>
+                </div>
             
-            <div class="form-group">
-                <button id="ok" type="submit" class="btn btn-primary w-100">Next</button>
-            </div>
+                <div class="form-group">
+                    <button id="ok" type="submit" class="btn btn-primary w-100">Next</button>
+                </div>
+            }
             break;
             
         case RefundSteps.SelectRate: