diff --git a/packages/react/src/Button/ButtonBase.module.css b/packages/react/src/Button/ButtonBase.module.css
index 7af731290da..eaa81e176c8 100644
--- a/packages/react/src/Button/ButtonBase.module.css
+++ b/packages/react/src/Button/ButtonBase.module.css
@@ -582,13 +582,13 @@
     }
   }
 
-  /* PERFORMANCE: Use data-no-visuals attribute instead of :has(.Visual) to avoid descendant scan */
+  /* PERFORMANCE: Use data-has-visuals attribute instead of :has(.Visual) to avoid descendant scan */
   [data-a11y-link-underlines='true'] &:where([data-variant='link']) {
-    &:where([data-no-visuals='true']) {
+    &:not([data-has-visuals]) {
       text-decoration: underline;
     }
 
-    &:not([data-no-visuals='true']) {
+    &[data-has-visuals] {
       background-image: linear-gradient(to right, currentColor, currentColor);
       background-size: 100% 1.5px;
       background-position: 0 calc(100% - 2px);
@@ -601,12 +601,12 @@
   }
 
   [data-a11y-link-underlines='false'] &:where([data-variant='link']) {
-    &:where([data-no-visuals='true']) {
+    &:not([data-has-visuals]) {
       text-decoration: none;
       background-image: none;
     }
 
-    &:not([data-no-visuals='true']) {
+    &[data-has-visuals] {
       background-image: none;
     }
   }
diff --git a/packages/react/src/Button/ButtonBase.tsx b/packages/react/src/Button/ButtonBase.tsx
index d2ae5a0b6ba..3d73e8bce98 100644
--- a/packages/react/src/Button/ButtonBase.tsx
+++ b/packages/react/src/Button/ButtonBase.tsx
@@ -98,7 +98,7 @@ const ButtonBase = forwardRef(({children, as: Component = 'button', ...props}, f
         data-block={block ? 'block' : null}
         data-inactive={inactive ? true : undefined}
         data-loading={Boolean(loading)}
-        data-no-visuals={!LeadingVisual && !TrailingVisual && !TrailingAction ? true : undefined}
+        data-has-visuals={LeadingVisual || TrailingVisual || TrailingAction ? true : undefined}
         data-size={size}
         data-variant={variant}
         data-label-wrap={labelWrap}
diff --git a/packages/react/src/Button/__tests__/__snapshots__/Button.test.tsx.snap b/packages/react/src/Button/__tests__/__snapshots__/Button.test.tsx.snap
index 0e24734daa4..c2bcee3007b 100644
--- a/packages/react/src/Button/__tests__/__snapshots__/Button.test.tsx.snap
+++ b/packages/react/src/Button/__tests__/__snapshots__/Button.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`Button > respects block prop 1`] = `
   class="prc-Button-ButtonBase-Eb8-K"
   data-block="block"
   data-loading="false"
-  data-no-visuals="true"
   data-size="medium"
   data-variant="default"
   id="test-button"
@@ -30,7 +29,6 @@ exports[`Button > respects the alignContent prop 1`] = `
 <button
   class="prc-Button-ButtonBase-Eb8-K"
   data-loading="false"
-  data-no-visuals="true"
   data-size="medium"
   data-variant="default"
   id="test-button"
@@ -55,7 +53,6 @@ exports[`Button > respects the large size prop 1`] = `
 <button
   class="prc-Button-ButtonBase-Eb8-K"
   data-loading="false"
-  data-no-visuals="true"
   data-size="large"
   data-variant="default"
   id="test-button"
@@ -80,7 +77,6 @@ exports[`Button > respects the small size prop 1`] = `
 <button
   class="prc-Button-ButtonBase-Eb8-K"
   data-loading="false"
-  data-no-visuals="true"
   data-size="small"
   data-variant="default"
   id="test-button"
@@ -105,7 +101,6 @@ exports[`Button > styles danger button appropriately 1`] = `
 <button
   class="prc-Button-ButtonBase-Eb8-K"
   data-loading="false"
-  data-no-visuals="true"
   data-size="medium"
   data-variant="danger"
   id="test-button"
@@ -130,7 +125,6 @@ exports[`Button > styles invisible button appropriately 1`] = `
 <button
   class="prc-Button-ButtonBase-Eb8-K"
   data-loading="false"
-  data-no-visuals="true"
   data-size="medium"
   data-variant="invisible"
   id="test-button"
@@ -155,7 +149,6 @@ exports[`Button > styles primary button appropriately 1`] = `
 <button
   class="prc-Button-ButtonBase-Eb8-K"
   data-loading="false"
-  data-no-visuals="true"
   data-size="medium"
   data-variant="primary"
   id="test-button"