diff --git a/packages/ui/src/components/Button/definition.ts b/packages/ui/src/components/Button/definition.ts
index 9f08f8e183..529d9c2c6f 100644
--- a/packages/ui/src/components/Button/definition.ts
+++ b/packages/ui/src/components/Button/definition.ts
@@ -15,13 +15,17 @@
  */
 
 import { defineComponent } from '../../hooks/useDefinition';
+import type { ButtonOwnProps } from './types';
 import styles from './Button.module.css';
 
 /**
  * Component definition for Button
  * @public
  */
-export const ButtonDefinition = defineComponent({
+export const ButtonDefinition = defineComponent<
+  ButtonOwnProps,
+  typeof styles
+>()({
   styles,
   classNames: {
     root: 'bui-Button',
diff --git a/packages/ui/src/hooks/useDefinition/defineComponent.ts b/packages/ui/src/hooks/useDefinition/defineComponent.ts
index d5bbf6039d..263e26eb76 100644
--- a/packages/ui/src/hooks/useDefinition/defineComponent.ts
+++ b/packages/ui/src/hooks/useDefinition/defineComponent.ts
@@ -19,7 +19,6 @@ import type { ComponentConfig } from './types';
 export function defineComponent<
   P extends Record<string, any>,
   S extends Record<string, string>,
-  const C extends ComponentConfig<P, S>,
->(config: C): C {
-  return config;
+>() {
+  return <const C extends ComponentConfig<P, S>>(config: C): C => config;
 }