diff --git a/resources/assets/javascripts/lib/wysiwyg.js b/resources/assets/javascripts/lib/wysiwyg.js
index b462602effb64c74b0ef758584f2118d70ece724..978328bb050f30300d10b806954349677b03a07e 100644
--- a/resources/assets/javascripts/lib/wysiwyg.js
+++ b/resources/assets/javascripts/lib/wysiwyg.js
@@ -213,8 +213,11 @@ function enhanceEditor($textarea, ckeditor) {
     // make sure HTML marker is always set, in
     // case contents are cut-off by the backend
     $textarea.closest('form').submit(() => {
-        ckeditor.setData(wysiwyg.markAsHtml(ckeditor.getData()));
-        ckeditor.updateSourceElement();
+        // only trigger if the editor is still attached to the textarea
+        if (getEditor($textarea[0]) === ckeditor) {
+            ckeditor.setData(wysiwyg.markAsHtml(ckeditor.getData()));
+            ckeditor.updateSourceElement();
+        }
     });
 
     // focus the editor if requested