diff --git a/docs/guides/using-theme-overrides.md b/docs/guides/using-theme-overrides.md
index 81d63c0c70..41812a9b6c 100644
--- a/docs/guides/using-theme-overrides.md
+++ b/docs/guides/using-theme-overrides.md
@@ -227,14 +227,17 @@ type: example
 
   <div>
     <Button color='primary'
-      themeOverride={{ primaryBackground: "purple" }}
+      themeOverride={{
+        primaryBackground: "purple",
+        borderRadius: '999rem'
+    }}
       margin="small 0 large">
-      Purple Primary Button
+      Purple Primary Button with rounded corners
     </Button>
     <InstUISettingsProvider
       theme={{
         componentOverrides: {
-          TextInput: { background: "yellow" }
+          TextInput: { backgroundColor: "yellow" }
         }
       }}
     >
diff --git a/packages/emotion/src/withStyle.tsx b/packages/emotion/src/withStyle.tsx
index 2e6225c3e6..d9fb927787 100644
--- a/packages/emotion/src/withStyle.tsx
+++ b/packages/emotion/src/withStyle.tsx
@@ -193,7 +193,7 @@ const withStyle = decorator(
         theme,
         displayName,
         ComposedComponent.componentId,
-        (componentProps as any).themeOverride,
+        (componentProps as ThemeOverrideProp).themeOverride,
         baseComponentTheme
       )
 
diff --git a/packages/emotion/src/withStyleRework.tsx b/packages/emotion/src/withStyleRework.tsx
index eb26262951..354beb0cc1 100644
--- a/packages/emotion/src/withStyleRework.tsx
+++ b/packages/emotion/src/withStyleRework.tsx
@@ -143,7 +143,7 @@ const withStyleRework = decorator(
         theme,
         displayName,
         ComposedComponent.componentId,
-        componentProps,
+        (componentProps as ThemeOverrideProp).themeOverride,
         componentTheme
       )