diff --git a/wax-prosemirror-core/src/Wax.js b/wax-prosemirror-core/src/Wax.js
index c08fefea4658be3a985238b75d3f8d4259a7104f..0299c3f0fff67ca84940089836000a483c1f482b 100644
--- a/wax-prosemirror-core/src/Wax.js
+++ b/wax-prosemirror-core/src/Wax.js
@@ -62,7 +62,7 @@ const Wax = props => {
           schema.nodes.footnote.spec.toDOM = node => {
             // eslint-disable-next-line prefer-rest-params
             old.apply(this);
-            return ['footnote', node.attrs, 0];
+            if (node) return ['footnote', node.attrs, 0];
           };
         }
 
@@ -72,13 +72,12 @@ const Wax = props => {
           const serialize = serializer(schema);
           WaxOnchange(serialize(value));
         }
-
         if (schema.nodes.footnote) {
           const old = schema.nodes.footnote.spec.toDOM;
           schema.nodes.footnote.spec.toDOM = node => {
             // eslint-disable-next-line prefer-rest-params
             old.apply(this);
-            return ['footnote', node.attrs];
+            if (node) return ['footnote', node.attrs];
           };
         }
       },
diff --git a/wax-prosemirror-core/src/WaxOptions.js b/wax-prosemirror-core/src/WaxOptions.js
index 71a6e691aa6af8948c6313d04f0200d7f6729da7..fa09e1f708ea02e7ca7cbbab8afa31494f812f47 100644
--- a/wax-prosemirror-core/src/WaxOptions.js
+++ b/wax-prosemirror-core/src/WaxOptions.js
@@ -52,6 +52,5 @@ export default ({ placeholder, targetFormat, value, schema, plugins }) => {
     const parse = parser(schema);
     WaxOptions.doc = parse(editorContent);
   }
-
   return WaxOptions;
 };
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 3a887c001952a36a764cbbc0d977c390cc7320c5..881606bc8bc269fa54e1a91ac9c66a59cb667300 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -131,17 +131,11 @@ export default props => {
         'main',
       );
     }
-<<<<<<< HEAD
-    if (view.state.doc !== previousDoc || tr.getMeta('forceUpdate'))
-      props.onChange(state.doc.content);
 
-=======
-    console.log(state);
->>>>>>> cleanup
     if (targetFormat === 'JSON') {
-      props.onChange(state.config.schema)(state.doc.toJSON());
+      props.onChange(schema)(state.doc.toJSON());
     } else {
-      props.onChange(state.config.schema)(state.doc.content);
+      props.onChange(schema)(state.doc.content);
     }
   };
 
diff --git a/wax-prosemirror-schema/src/nodes/footNoteNode.js b/wax-prosemirror-schema/src/nodes/footNoteNode.js
index 582da4bc05536573939652e17f37ee7be631c360..625f0b44c28519f5bb8132c47cfdc962086a460a 100644
--- a/wax-prosemirror-schema/src/nodes/footNoteNode.js
+++ b/wax-prosemirror-schema/src/nodes/footNoteNode.js
@@ -7,7 +7,9 @@ const footnote = {
     id: { default: '' },
   },
   toDOM: node => {
-    return ['footnote', node.attrs];
+    if (node) {
+      return ['footnote', node.attrs];
+    }
   },
   parseDOM: [
     {