diff --git a/apps/v4/registry/bases/radix/ui/button.test.tsx b/apps/v4/registry/bases/radix/ui/button.test.tsx
new file mode 100644
index 00000000000..baae520dd9d
--- /dev/null
+++ b/apps/v4/registry/bases/radix/ui/button.test.tsx
@@ -0,0 +1,22 @@
+import * as React from "react"
+import { renderToStaticMarkup } from "react-dom/server"
+import { describe, expect, it } from "vitest"
+
+import { Button } from "./button"
+
+describe("radix button", () => {
+  it("is a forwardRef component", () => {
+    expect(Button.$$typeof).toBe(Symbol.for("react.forward_ref"))
+  })
+
+  it("renders an asChild child without wrapping", () => {
+    const html = renderToStaticMarkup(
+      <Button asChild>
+        <span>Action</span>
+      </Button>
+    )
+
+    expect(html).toMatch(/^<span\b[^>]*>Action<\/span>$/)
+    expect(html).not.toContain("<button")
+  })
+})
diff --git a/apps/v4/registry/bases/radix/ui/button.tsx b/apps/v4/registry/bases/radix/ui/button.tsx
index 374f63faac5..deee3a34b33 100644
--- a/apps/v4/registry/bases/radix/ui/button.tsx
+++ b/apps/v4/registry/bases/radix/ui/button.tsx
@@ -34,20 +34,26 @@ const buttonVariants = cva(
   }
 )
 
-function Button({
-  className,
-  variant = "default",
-  size = "default",
-  asChild = false,
-  ...props
-}: React.ComponentProps<"button"> &
+type ButtonProps = React.ComponentProps<"button"> &
   VariantProps<typeof buttonVariants> & {
     asChild?: boolean
-  }) {
+  }
+
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(function Button(
+  {
+    className,
+    variant = "default",
+    size = "default",
+    asChild = false,
+    ...props
+  },
+  ref
+) {
   const Comp = asChild ? Slot.Root : "button"
 
   return (
     <Comp
+      ref={ref}
       data-slot="button"
       data-variant={variant}
       data-size={size}
@@ -55,6 +61,8 @@ function Button({
       {...props}
     />
   )
-}
+})
+
+Button.displayName = "Button"
 
 export { Button, buttonVariants }
diff --git a/apps/v4/registry/new-york-v4/ui/button.test.tsx b/apps/v4/registry/new-york-v4/ui/button.test.tsx
new file mode 100644
index 00000000000..17d538b7f6d
--- /dev/null
+++ b/apps/v4/registry/new-york-v4/ui/button.test.tsx
@@ -0,0 +1,22 @@
+import * as React from "react"
+import { renderToStaticMarkup } from "react-dom/server"
+import { describe, expect, it } from "vitest"
+
+import { Button } from "./button"
+
+describe("new-york Button", () => {
+  it("is a forwardRef component", () => {
+    expect(Button.$$typeof).toBe(Symbol.for("react.forward_ref"))
+  })
+
+  it("renders an asChild child without wrapping", () => {
+    const html = renderToStaticMarkup(
+      <Button asChild>
+        <span>Action</span>
+      </Button>
+    )
+
+    expect(html).toMatch(/^<span\b[^>]*>Action<\/span>$/)
+    expect(html).not.toContain("<button")
+  })
+})
diff --git a/apps/v4/registry/new-york-v4/ui/button.tsx b/apps/v4/registry/new-york-v4/ui/button.tsx
index 4d38506cee5..1e3246e3069 100644
--- a/apps/v4/registry/new-york-v4/ui/button.tsx
+++ b/apps/v4/registry/new-york-v4/ui/button.tsx
@@ -38,20 +38,26 @@ const buttonVariants = cva(
   }
 )
 
-function Button({
-  className,
-  variant = "default",
-  size = "default",
-  asChild = false,
-  ...props
-}: React.ComponentProps<"button"> &
+type ButtonProps = React.ComponentProps<"button"> &
   VariantProps<typeof buttonVariants> & {
     asChild?: boolean
-  }) {
+  }
+
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(function Button(
+  {
+    className,
+    variant = "default",
+    size = "default",
+    asChild = false,
+    ...props
+  },
+  ref
+) {
   const Comp = asChild ? Slot.Root : "button"
 
   return (
     <Comp
+      ref={ref}
       data-slot="button"
       data-variant={variant}
       data-size={size}
@@ -59,6 +65,8 @@ function Button({
       {...props}
     />
   )
-}
+})
+
+Button.displayName = "Button"
 
 export { Button, buttonVariants }