diff --git a/.changeset/fifty-peas-swim.md b/.changeset/fifty-peas-swim.md
new file mode 100644
index 0000000000..e453cfcf3a
--- /dev/null
+++ b/.changeset/fifty-peas-swim.md
@@ -0,0 +1,6 @@
+---
+"@twilio-paste/chat-composer": patch
+"@twilio-paste/core": patch
+---
+
+[Chat Composer] Change overflowY from "scroll" to "auto" to prevent non-scrollable scrollbar bug
diff --git a/packages/paste-core/components/chat-composer/src/ChatComposer.tsx b/packages/paste-core/components/chat-composer/src/ChatComposer.tsx
index 2d9fff37f2..6be74a280d 100644
--- a/packages/paste-core/components/chat-composer/src/ChatComposer.tsx
+++ b/packages/paste-core/components/chat-composer/src/ChatComposer.tsx
@@ -116,7 +116,7 @@ export const ChatComposer = React.forwardRef<HTMLDivElement, ChatComposerProps>(
         paddingX="space40"
         borderRadius="borderRadius20"
         _focusWithin={{ boxShadow: "shadowFocus" }}
-        overflowY="scroll"
+        overflowY="auto"
         maxHeight={maxHeight}
         disabled={disabled}
         aria-disabled={disabled}
diff --git a/packages/paste-website/src/component-examples/ChatComposerExamples.tsx b/packages/paste-website/src/component-examples/ChatComposerExamples.tsx
index 8595dfa34a..9a18c97a30 100644
--- a/packages/paste-website/src/component-examples/ChatComposerExamples.tsx
+++ b/packages/paste-website/src/component-examples/ChatComposerExamples.tsx
@@ -213,7 +213,7 @@ export const ChatDialogExample = `const ChatDialog = () => {
 
   return (
     <Box>
-      <Box ref={scrollerRef} overflowX="hidden" overflowY="scroll" maxHeight="size50" tabIndex={0}>
+      <Box ref={scrollerRef} overflowX="hidden" overflowY="auto" maxHeight="size50" tabIndex={0}>
         <ChatLogger ref={loggerRef} chats={chats} />
       </Box>
       <Box