diff --git a/src/reverseproxy.go b/src/reverseproxy.go
index f2bf611..4a790e8 100644
--- a/src/reverseproxy.go
+++ b/src/reverseproxy.go
@@ -1427,7 +1427,11 @@ func HandleHSTSState(w http.ResponseWriter, r *http.Request) {
 
 		if newMaxAge == 0 || newMaxAge >= 31536000 {
 			targetProxyEndpoint.HSTSMaxAge = int64(newMaxAge)
-			SaveReverseProxyConfig(targetProxyEndpoint)
+			err = SaveReverseProxyConfig(targetProxyEndpoint)
+			if err != nil {
+				utils.SendErrorResponse(w, "save HSTS state failed: "+err.Error())
+				return
+			}
 			targetProxyEndpoint.UpdateToRuntime()
 		} else {
 			utils.SendErrorResponse(w, "invalid max age given")
diff --git a/src/web/snippet/customHeaders.html b/src/web/snippet/customHeaders.html
index ebde374..b285ea5 100644
--- a/src/web/snippet/customHeaders.html
+++ b/src/web/snippet/customHeaders.html
@@ -364,7 +364,7 @@
                             method: "POST",
                             data: {
                                 "domain": editingEndpoint.ep,
-                                "maxage": 31536000
+                                "maxage": HSTSEnabled?31536000:0,
                             },
                             success: function(data){
                                 if (data.error != undefined){