diff --git a/packages/@mantine/core/src/core/factory/create-polymorphic-component.ts b/packages/@mantine/core/src/core/factory/create-polymorphic-component.ts
index 5bc066e577..cdaa15e327 100644
--- a/packages/@mantine/core/src/core/factory/create-polymorphic-component.ts
+++ b/packages/@mantine/core/src/core/factory/create-polymorphic-component.ts
@@ -18,12 +18,19 @@ export type PolymorphicRef<C> = C extends React.ElementType
   ? React.ComponentPropsWithRef<C>['ref']
   : never;
 
-export type PolymorphicComponentProps<C, Props = {}> = C extends React.ElementType
-  ? InheritedProps<C, Props & ComponentProp<C>> & {
+export type PolymorphicComponentProps<C, Props = {}> = C extends React.ElementType 
+  ? InheritedProps<C, Props & ComponentProp<C>> & { 
       ref?: PolymorphicRef<C>;
       renderRoot?: (props: any) => any;
     }
-  : Props & { component: React.ElementType; renderRoot?: (props: Record<string, any>) => any };
+  : Props extends Record<string, unknown> 
+    ? Props & FallbackProps 
+    : FallbackProps;
+    
+type FallbackProps = {
+  component: React.ElementType;
+  renderRoot?: (props: Record<string, any>) => any;
+};
 
 export function createPolymorphicComponent<
   ComponentDefaultType,