diff --git a/core/misc/ajax.es6.js b/core/misc/ajax.es6.js
index fa4e3a55f0..2dd873cc4b 100644
--- a/core/misc/ajax.es6.js
+++ b/core/misc/ajax.es6.js
@@ -484,11 +484,19 @@
       },
       beforeSubmit(formValues, elementSettings, options) {
         ajax.ajaxing = true;
-        return ajax.beforeSubmit(formValues, elementSettings, options);
+        var continueSubmit = ajax.beforeSubmit(formValues, elementSettings, options);
+        if (continueSubmit === false) {
+          ajax.ajaxing = false;
+        }
+        return continueSubmit;
       },
       beforeSend(xmlhttprequest, options) {
         ajax.ajaxing = true;
-        return ajax.beforeSend(xmlhttprequest, options);
+        var continueSend = ajax.beforeSend(xmlhttprequest, options);
+        if (continueSend === false) {
+          ajax.ajaxing = false;
+        }
+        return continueSend;
       },
       success(response, status, xmlhttprequest) {
         // Sanity check for browser support (object expected).
diff --git a/core/misc/ajax.js b/core/misc/ajax.js
index fd79aa5ab5..8956d63b10 100644
--- a/core/misc/ajax.js
+++ b/core/misc/ajax.js
@@ -207,15 +207,19 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
       },
       beforeSubmit: function beforeSubmit(formValues, elementSettings, options) {
         ajax.ajaxing = true;
-        var continue_submit = ajax.beforeSubmit(formValues, elementSettings, options);
-        if (continue_submit === false) {
+        var continueSubmit = ajax.beforeSubmit(formValues, elementSettings, options);
+        if (continueSubmit === false) {
           ajax.ajaxing = false;
         }
-        return continue_submit;
+        return continueSubmit;
       },
       beforeSend: function beforeSend(xmlhttprequest, options) {
         ajax.ajaxing = true;
-        return ajax.beforeSend(xmlhttprequest, options);
+        var continueSend = ajax.beforeSend(xmlhttprequest, options);
+        if (continueSend === false) {
+          ajax.ajaxing = false;
+        }
+        return continueSend;
       },
       success: function success(response, status, xmlhttprequest) {
         if (typeof response === 'string') {