diff --git a/src/components/themr.js b/src/components/themr.js
index e19711f..0acae2b 100644
--- a/src/components/themr.js
+++ b/src/components/themr.js
@@ -54,7 +54,7 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
    * @property {{wrappedInstance: *}} refs
    */
   class Themed extends Component {
-    static displayName = `Themed${ThemedComponent.name}`;
+    static displayName = `Themed${(ThemedComponent.displayName || ThemedComponent.name || "Component")}`;
 
     static contextTypes = {
       themr: PropTypes.object