diff --git a/src/components/themr.js b/src/components/themr.js
index f4c5fd2..8a248dc 100644
--- a/src/components/themr.js
+++ b/src/components/themr.js
@@ -104,6 +104,14 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
         : {}
     }
 
+    getPropsForComponent() {
+      //exclude themr-only props
+      //noinspection JSUnusedLocalSymbols
+      const { composeTheme, innerRef, themeNamespace, ...props } = this.props //eslint-disable-line no-unused-vars
+
+      return props
+    }
+
     getTheme(props) {
       return props.composeTheme === COMPOSE_SOFTLY
         ? {
@@ -135,9 +143,8 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
     }
 
     render() {
-      //exclude themr-only props
-      //noinspection JSUnusedLocalSymbols
-      const { composeTheme, innerRef, themeNamespace, ...props } = this.props //eslint-disable-line no-unused-vars
+      const { innerRef } = this.props
+      const props = this.getPropsForComponent()
 
       return React.createElement(ThemedComponent, {
         ...props,