diff --git a/pkg/invoices.go b/pkg/invoices.go
index 6225607..da3c52d 100644
--- a/pkg/invoices.go
+++ b/pkg/invoices.go
@@ -463,7 +463,9 @@ func HandleAddInvoice(w http.ResponseWriter, r *http.Request, _ httprouter.Param
 		return
 	}
 	if !form.Validate() {
-		w.WriteHeader(http.StatusUnprocessableEntity)
+		if !IsHTMxRequest(r) {
+			w.WriteHeader(http.StatusUnprocessableEntity)
+		}
 		mustRenderNewInvoiceForm(w, r, form)
 		return
 	}
@@ -840,7 +842,9 @@ func HandleUpdateInvoice(w http.ResponseWriter, r *http.Request, params httprout
 	} else {
 		slug := params[0].Value
 		if !form.Validate() {
-			w.WriteHeader(http.StatusUnprocessableEntity)
+			if !IsHTMxRequest(r) {
+				w.WriteHeader(http.StatusUnprocessableEntity)
+			}
 			mustRenderEditInvoiceForm(w, r, slug, form)
 			return
 		}