diff --git a/src/material-experimental/mdc-progress-spinner/progress-spinner.scss b/src/material-experimental/mdc-progress-spinner/progress-spinner.scss
index 580735bccd1c..27748a36dcd5 100644
--- a/src/material-experimental/mdc-progress-spinner/progress-spinner.scss
+++ b/src/material-experimental/mdc-progress-spinner/progress-spinner.scss
@@ -1,18 +1,28 @@
 @import '@material/circular-progress/mixins.import';
 @import '../mdc-helpers/mdc-helpers';
 
-@include mdc-circular-progress-core-styles($query: $mat-base-styles-without-animation-query);
+@include mdc-circular-progress-core-styles($query: $mat-base-styles-query);
 
 .mat-mdc-progress-spinner {
   // Prevents the spinning of the inner element from affecting layout outside of the spinner.
   overflow: hidden;
-}
 
-.mat-mdc-progress-spinner:not(._mat-animation-noopable) {
-  @include mdc-circular-progress-core-styles($query: animation);
-}
+  &._mat-animation-noopable {
+    &, .mdc-circular-progress__determinate-circle {
+      // The spinner itself has a transition on `opacity`.
+      transition: none;
+    }
+
+    .mdc-circular-progress__indeterminate-circle-graphic,
+    .mdc-circular-progress__spinner-layer,
+    .mdc-circular-progress__indeterminate-container {
+      // Disables the rotation animations.
+      animation: none;
+    }
 
-// Render the indeterminate spinner as a complete circle when animations are off
-._mat-animation-noopable .mdc-circular-progress__indeterminate-container circle {
-  stroke-dasharray: 0 !important;
+    .mdc-circular-progress__indeterminate-container circle {
+      // Render the indeterminate spinner as a complete circle when animations are off
+      stroke-dasharray: 0 !important;
+    }
+  }
 }