diff --git a/packages/babel-plugin-transform-react-inline-elements/src/index.js b/packages/babel-plugin-transform-react-inline-elements/src/index.js
index 36812f1c04..98bccdc51c 100644
--- a/packages/babel-plugin-transform-react-inline-elements/src/index.js
+++ b/packages/babel-plugin-transform-react-inline-elements/src/index.js
@@ -67,7 +67,7 @@ export default function ({ types: t }) {
           if (props.properties.length) {
             props = t.callExpression(file.addHelper("defaultProps"), [defProps, props]);
           } else {
-            props = defProps;
+            props = t.logicalExpression("||", defProps, props);
           }
         }
 
diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/component/expected.js b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/component/expected.js
index 1c42c05967..d5eadb5b14 100644
--- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/component/expected.js
+++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/component/expected.js
@@ -1 +1 @@
-babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps);
\ No newline at end of file
+babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps || {});
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/multiline/expected.js b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/multiline/expected.js
index 1c42c05967..d5eadb5b14 100644
--- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/multiline/expected.js
+++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/multiline/expected.js
@@ -1 +1 @@
-babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps);
\ No newline at end of file
+babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps || {});
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested-components/expected.js b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested-components/expected.js
index 6f84850b3a..61ff4ecd4b 100644
--- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested-components/expected.js
+++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested-components/expected.js
@@ -1,4 +1,4 @@
 babelHelpers.createRawReactElement(Foo, null, babelHelpers.defaultProps(Foo.defaultProps, {
   className: "foo",
-  children: [bar, babelHelpers.createRawReactElement(Baz, "baz", Baz.defaultProps)]
+  children: [bar, babelHelpers.createRawReactElement(Baz, "baz", Baz.defaultProps || {})]
 }));
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested/expected.js b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested/expected.js
index 105760a00a..3a5eb10f31 100644
--- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested/expected.js
+++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested/expected.js
@@ -1,4 +1,4 @@
 babelHelpers.createRawReactElement("div", null, {
   className: "foo",
-  children: [bar, babelHelpers.createRawReactElement(Baz, "baz", Baz.defaultProps)]
+  children: [bar, babelHelpers.createRawReactElement(Baz, "baz", Baz.defaultProps || {})]
 });
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/self-closing-component/expected.js b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/self-closing-component/expected.js
index 1c42c05967..d5eadb5b14 100644
--- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/self-closing-component/expected.js
+++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/self-closing-component/expected.js
@@ -1 +1 @@
-babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps);
\ No newline at end of file
+babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps || {});
\ No newline at end of file