diff --git a/types/baseui/baseui-tests.tsx b/types/baseui/baseui-tests.tsx
index 0d46c83406..032c2b0221 100644
--- a/types/baseui/baseui-tests.tsx
+++ b/types/baseui/baseui-tests.tsx
@@ -110,6 +110,17 @@ const NewStyledProgressSteps = styled<ProgressStepsStyleProps, typeof StyledProg
 // Avatar
 <Avatar name='user' size='10'/>;
 <Avatar name='user' size={10}/>; // $ExpectError
+<Avatar
+    name="user"
+    overrides={{ Root: { style: ({ $theme }) => ({ height: $theme.sizing && $theme.sizing.scale1000 }) } }}
+/>;
+<Avatar
+    name="user"
+    overrides={{ Root: { style: ({ $didImageFailToLoad }) => ({ height: $didImageFailToLoad ? '0' : '10px' }) } }}
+/>;
+<Avatar name="user" overrides={{ Root: { style: ({ children }) => ({ height: children ? '10px' : '0'})} }} />;
+<Avatar name="user" overrides={{ Root: { style: ({ $theme }) => ({ height: $theme.sizing && $theme.sizing.notasize })} }} />; // $ExpectError
+<Avatar name="user" overrides={{ Root: { style: ({ $nonExistantProp }) => ({}) }}} />; // $ExpectError
 
 // Block
 <Block as='h1'/>;
diff --git a/types/baseui/overrides.d.ts b/types/baseui/overrides.d.ts
index 066d8f3cbc..752cb4b714 100644
--- a/types/baseui/overrides.d.ts
+++ b/types/baseui/overrides.d.ts
@@ -1,9 +1,9 @@
-type StyleOverride = object | ((props: any) => object);
+type StyleOverride<T> = object | ((props: { $theme: Theme } & React.PropsWithChildren<T>) => object);
 
 interface OverrideObject<T> {
   component?: React.ComponentType<T>;
   props?: object;
-  style?: StyleOverride;
+  style?: StyleOverride<T>;
 }
 
 type Override<T> = OverrideObject<T> | React.ComponentType<T>;