diff --git a/BTCPayServer/Controllers/PublicController.cs b/BTCPayServer/Controllers/PublicController.cs
index c30259ccb..3d091d091 100644
--- a/BTCPayServer/Controllers/PublicController.cs
+++ b/BTCPayServer/Controllers/PublicController.cs
@@ -75,6 +75,11 @@ namespace BTCPayServer.Controllers
             catch (BitpayHttpException e)
             {
                 ModelState.AddModelError("Store", e.Message);
+                if (model.JsonResponse)
+                {
+                    return BadRequest(ModelState);
+                }
+
                 return View();
             }