diff --git a/packages/@react-spectrum/s2/src/ActionButton.tsx b/packages/@react-spectrum/s2/src/ActionButton.tsx
index 7d5cd63d0d9..8ddaea0b68d 100644
--- a/packages/@react-spectrum/s2/src/ActionButton.tsx
+++ b/packages/@react-spectrum/s2/src/ActionButton.tsx
@@ -313,9 +313,8 @@ export const ActionButton = forwardRef(function ActionButton(props: ActionButton
                 style({
                   order: 1,
                   truncate: true,
-                  opacity: {
-                    default: 1,
-                    isProgressVisible: 0
+                  visibility: {
+                    isProgressVisible: 'hidden'
                   }
                 })({isProgressVisible})
               }],
@@ -325,9 +324,8 @@ export const ActionButton = forwardRef(function ActionButton(props: ActionButton
                   size: fontRelative(20),
                   marginStart: '--iconMargin',
                   flexShrink: 0,
-                  opacity: {
-                    default: 1,
-                    isProgressVisible: 0
+                  visibility: {
+                    isProgressVisible: 'hidden'
                   }
                 })({isProgressVisible})
               }],
@@ -341,9 +339,8 @@ export const ActionButton = forwardRef(function ActionButton(props: ActionButton
               }],
               [ImageContext, {
                 styles: style({
-                  opacity: {
-                    default: 1,
-                    isProgressVisible: 0
+                  visibility: {
+                    isProgressVisible: 'hidden'
                   }
                 })({isProgressVisible})
               }],
@@ -357,9 +354,8 @@ export const ActionButton = forwardRef(function ActionButton(props: ActionButton
                   insetStart: '--badgePosition',
                   marginTop: 'calc((self(height) * -1)/2)',
                   marginStart: 'calc((self(height) * -1)/2)',
-                  opacity: {
-                    default: 1,
-                    isProgressVisible: 0
+                  visibility: {
+                    isProgressVisible: 'hidden'
                   }
                 })({isProgressVisible})
               }]
@@ -372,9 +368,9 @@ export const ActionButton = forwardRef(function ActionButton(props: ActionButton
                   top: '50%',
                   left: '50%',
                   transform: 'translate(-50%, -50%)',
-                  opacity: {
-                    default: 0,
-                    isProgressVisible: 1
+                  visibility: {
+                    default: 'hidden',
+                    isProgressVisible: 'visible'
                   }
                 })({isProgressVisible, isPending})}>
                 <ProgressCircle
diff --git a/packages/@react-spectrum/s2/src/Button.tsx b/packages/@react-spectrum/s2/src/Button.tsx
index d7d28f8652d..acd77cb9721 100644
--- a/packages/@react-spectrum/s2/src/Button.tsx
+++ b/packages/@react-spectrum/s2/src/Button.tsx
@@ -367,9 +367,8 @@ export const Button = forwardRef(function Button(props: ButtonProps, ref: Focusa
               styles: style({
                 paddingY: '--labelPadding',
                 order: 1,
-                opacity: {
-                  default: 1,
-                  isProgressVisible: 0
+                visibility: {
+                  isProgressVisible: 'hidden'
                 }
               })({isProgressVisible}),
               // @ts-ignore data-attributes allowed on all JSX elements, but adding to DOMProps has been problematic in the past
@@ -381,9 +380,8 @@ export const Button = forwardRef(function Button(props: ButtonProps, ref: Focusa
                 size: fontRelative(20),
                 marginStart: '--iconMargin',
                 flexShrink: 0,
-                opacity: {
-                  default: 1,
-                  isProgressVisible: 0
+                visibility: {
+                  isProgressVisible: 'hidden'
                 }
               })({isProgressVisible})
             }]
@@ -396,9 +394,9 @@ export const Button = forwardRef(function Button(props: ButtonProps, ref: Focusa
                 top: '50%',
                 left: '50%',
                 transform: 'translate(-50%, -50%)',
-                opacity: {
-                  default: 0,
-                  isProgressVisible: 1
+                visibility: {
+                  default: 'hidden',
+                  isProgressVisible: 'visible'
                 }
               })({isProgressVisible, isPending})}>
               <ProgressCircle
diff --git a/packages/@react-spectrum/s2/src/style-utils.ts b/packages/@react-spectrum/s2/src/style-utils.ts
index 07f2334db24..ea5e35091d7 100644
--- a/packages/@react-spectrum/s2/src/style-utils.ts
+++ b/packages/@react-spectrum/s2/src/style-utils.ts
@@ -303,7 +303,6 @@ const allowedOverrides = [
   'insetY',
   'insetStart',
   'insetEnd',
-  'opacity',
   'visibility'
 ] as const;