diff --git a/.changeset/strong-walls-approve.md b/.changeset/strong-walls-approve.md
new file mode 100644
index 00000000000..19555bb39dd
--- /dev/null
+++ b/.changeset/strong-walls-approve.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Update BaseStyles to set data-color-mode to auto when colorMode in ThemeProvider is auto
diff --git a/packages/react/src/BaseStyles.tsx b/packages/react/src/BaseStyles.tsx
index fbac4115d21..ad4dd63b52d 100644
--- a/packages/react/src/BaseStyles.tsx
+++ b/packages/react/src/BaseStyles.tsx
@@ -54,7 +54,7 @@ export type BaseStylesProps = PropsWithChildren & {
 
 function BaseStyles(props: BaseStylesProps) {
   const {children, color, fontFamily, lineHeight, className, as: Component = 'div', style, ...rest} = props
-  const {colorScheme, dayScheme, nightScheme} = useTheme()
+  const {colorMode, colorScheme, dayScheme, nightScheme} = useTheme()
   const enabled = useFeatureFlag(CSS_MODULES_FEATURE_FLAG)
 
   if (enabled) {
@@ -79,7 +79,7 @@ function BaseStyles(props: BaseStylesProps) {
            * valid color modes for primer/primitives: auto | light | dark
            * valid color modes for primer/primer: auto | day | night | light | dark
            */
-          data-color-mode={colorScheme?.includes('dark') ? 'dark' : 'light'}
+          data-color-mode={colorMode === 'auto' ? 'auto' : colorScheme?.includes('dark') ? 'dark' : 'light'}
           data-light-theme={dayScheme}
           data-dark-theme={nightScheme}
           style={{
@@ -103,7 +103,7 @@ function BaseStyles(props: BaseStylesProps) {
          * valid color modes for primer/primitives: auto | light | dark
          * valid color modes for primer/primer: auto | day | night | light | dark
          */
-        data-color-mode={colorScheme?.includes('dark') ? 'dark' : 'light'}
+        data-color-mode={colorMode === 'auto' ? 'auto' : colorScheme?.includes('dark') ? 'dark' : 'light'}
         data-light-theme={dayScheme}
         data-dark-theme={nightScheme}
         style={{
@@ -129,7 +129,7 @@ function BaseStyles(props: BaseStylesProps) {
        * valid color modes for primer/primitives: auto | light | dark
        * valid color modes for primer/primer: auto | day | night | light | dark
        */
-      data-color-mode={colorScheme?.includes('dark') ? 'dark' : 'light'}
+      data-color-mode={colorMode === 'auto' ? 'auto' : colorScheme?.includes('dark') ? 'dark' : 'light'}
       data-light-theme={dayScheme}
       data-dark-theme={nightScheme}
       style={style}