2 files changed, 9 insertions, 2 deletions
diff --git a/packages/renderers/renderer-react/client.js b/packages/renderers/renderer-react/client.js
index b699a76d0..aa29d1ba9 100644
--- a/packages/renderers/renderer-react/client.js
+++ b/packages/renderers/renderer-react/client.js
@@ -3,4 +3,11 @@ import { hydrate } from 'react-dom';
 import StaticHtml from './static-html.js';
 
 export default (element) => (Component, props, children) =>
-  hydrate(createElement(Component, { ...props, suppressHydrationWarning: true }, createElement(StaticHtml, { value: children, suppressHydrationWarning: true })), element);
+  hydrate(
+    createElement(
+      Component,
+      { ...props, suppressHydrationWarning: true },
+      children != null ? createElement(StaticHtml, { value: children, suppressHydrationWarning: true }) : children
+    ),
+    element
+  );
diff --git a/packages/renderers/renderer-react/server.js b/packages/renderers/renderer-react/server.js
index 905390f38..2660c8762 100644
--- a/packages/renderers/renderer-react/server.js
+++ b/packages/renderers/renderer-react/server.js
@@ -50,7 +50,7 @@ function renderToStaticMarkup(Component, props, children, metadata) {
   delete props['class'];
   const vnode = React.createElement(Component, {
     ...props,
-    children: React.createElement(StaticHtml, { value: children }),
+    children: children != null ? React.createElement(StaticHtml, { value: children }) : undefined,
   });
   let html;
   if (metadata && metadata.hydrate) {