diff --git a/.changeset/great-kids-worry.md b/.changeset/great-kids-worry.md
index 5f8b82048..551b14713 100644
--- a/.changeset/great-kids-worry.md
+++ b/.changeset/great-kids-worry.md
@@ -1,5 +1,5 @@
 ---
-"assistant-ui": patch
+"@assistant-ui/react": patch
 ---
 
 feat: ignore edits with text part unchanged
diff --git a/.changeset/swift-ads-search.md b/.changeset/swift-ads-search.md
new file mode 100644
index 000000000..3467b9328
--- /dev/null
+++ b/.changeset/swift-ads-search.md
@@ -0,0 +1,5 @@
+---
+"@assistant-ui/react": patch
+---
+
+fix: createActionButton disabled handling
diff --git a/packages/react/src/utils/createActionButton.tsx b/packages/react/src/utils/createActionButton.tsx
index 83fba33f3..5ee40ff6e 100644
--- a/packages/react/src/utils/createActionButton.tsx
+++ b/packages/react/src/utils/createActionButton.tsx
@@ -36,9 +36,9 @@ export const createActionButton = <TProps,>(
     return (
       <Primitive.button
         type="button"
-        disabled={!callback}
         {...primitiveProps}
         ref={forwardedRef}
+        disabled={primitiveProps.disabled || !callback}
         onClick={composeEventHandlers(primitiveProps.onClick, () => {
           callback?.();
         })}