diff --git a/src/components/content.js b/src/components/content.js
index 4ca105244..f3c8b7540 100644
--- a/src/components/content.js
+++ b/src/components/content.js
@@ -878,6 +878,7 @@ class Content extends React.Component {
     return (
       <Node
         key={node.key}
+        block={null}
         node={node}
         parent={state.document}
         schema={schema}
diff --git a/src/components/node.js b/src/components/node.js
index abfccf99a..cef8633fb 100644
--- a/src/components/node.js
+++ b/src/components/node.js
@@ -226,16 +226,17 @@ class Node extends React.Component {
    */
 
   renderNode = (child) => {
+    const { block, editor, node, readOnly, schema, state } = this.props
     return (
       <Node
         key={child.key}
         node={child}
-        block={this.props.node.kind == 'block' ? this.props.node : this.props.block}
-        parent={this.props.node}
-        editor={this.props.editor}
-        readOnly={this.props.readOnly}
-        schema={this.props.schema}
-        state={this.props.state}
+        block={node.kind == 'block' ? node : block}
+        parent={node}
+        editor={editor}
+        readOnly={readOnly}
+        schema={schema}
+        state={state}
       />
     )
   }
diff --git a/src/components/void.js b/src/components/void.js
index 2c6fe9d2e..14c5c595f 100644
--- a/src/components/void.js
+++ b/src/components/void.js
@@ -29,6 +29,7 @@ class Void extends React.Component {
    */
 
   static propTypes = {
+    block: React.PropTypes.object,
     children: React.PropTypes.any.isRequired,
     editor: React.PropTypes.object.isRequired,
     node: React.PropTypes.object.isRequired,
@@ -167,7 +168,7 @@ class Void extends React.Component {
     return (
       <Leaf
         key={offsetKey}
-        block={block}
+        block={node.kind == 'block' ? node : block}
         editor={editor}
         index={index}
         marks={marks}