diff --git a/BTCPayServer/Controllers/StoresController.Integrations.cs b/BTCPayServer/Controllers/StoresController.Integrations.cs
index 05685e514..a6387aa71 100644
--- a/BTCPayServer/Controllers/StoresController.Integrations.cs
+++ b/BTCPayServer/Controllers/StoresController.Integrations.cs
@@ -128,7 +128,7 @@ namespace BTCPayServer.Controllers
             if (result.Success) {
                 TempData[WellKnownTempData.SuccessMessage] = $"{viewModel.Type.ToString()} event delivered successfully!";
             } else {
-                TempData[WellKnownTempData.ErrorMessage] = $"{viewModel.Type.ToString()} event could not be delivered";
+                TempData[WellKnownTempData.ErrorMessage] = $"{viewModel.Type.ToString()} event could not be delivered. Error message received: {(result.ErrorMessage ?? "unknown")}";
             }
 
             return View(nameof(TestWebhook));
diff --git a/BTCPayServer/HostedServices/WebhookNotificationManager.cs b/BTCPayServer/HostedServices/WebhookNotificationManager.cs
index a7f3430b0..1c9037380 100644
--- a/BTCPayServer/HostedServices/WebhookNotificationManager.cs
+++ b/BTCPayServer/HostedServices/WebhookNotificationManager.cs
@@ -299,6 +299,7 @@ namespace BTCPayServer.HostedServices
         {
             public string? DeliveryId { get; set; }
             public bool Success { get; set; }
+            public string? ErrorMessage { get; set; }
         }
 
         private async Task<DeliveryResult> SendDelivery(WebhookDeliveryRequest ctx)
@@ -338,7 +339,12 @@ namespace BTCPayServer.HostedServices
             }
             ctx.Delivery.SetBlob(deliveryBlob);
 
-            return new DeliveryResult() { Success = deliveryBlob.ErrorMessage is null, DeliveryId = ctx.Delivery.Id };
+            return new DeliveryResult() 
+            { 
+                Success = deliveryBlob.ErrorMessage is null, 
+                DeliveryId = ctx.Delivery.Id, 
+                ErrorMessage = deliveryBlob.ErrorMessage
+            };
         }