diff --git a/assets/js/src/form_editor/store/actions.jsx b/assets/js/src/form_editor/store/actions.jsx
index bca84d97ed..c296c77b46 100644
--- a/assets/js/src/form_editor/store/actions.jsx
+++ b/assets/js/src/form_editor/store/actions.jsx
@@ -47,7 +47,6 @@ export function* saveForm() {
   yield {
     type: 'SAVE_FORM_STARTED',
   };
-  yield removeNotice('save-form');
   yield {
     type: 'SAVE_FORM',
   };
diff --git a/assets/js/src/form_editor/store/controls.jsx b/assets/js/src/form_editor/store/controls.jsx
index 4cd0b7da97..b78458805f 100644
--- a/assets/js/src/form_editor/store/controls.jsx
+++ b/assets/js/src/form_editor/store/controls.jsx
@@ -4,6 +4,7 @@ import MailPoet from 'mailpoet';
 export default {
   SAVE_FORM() {
     const formData = select('mailpoet-form-editor').getFormData();
+    dispatch('mailpoet-form-editor').removeNotice('save-form');
     MailPoet.Ajax.post({
       api_version: window.mailpoet_api_version,
       endpoint: 'forms',