diff --git a/src/material/expansion/_expansion-theme.scss b/src/material/expansion/_expansion-theme.scss
index ee3a6981cf89..c2d3abba1f97 100644
--- a/src/material/expansion/_expansion-theme.scss
+++ b/src/material/expansion/_expansion-theme.scss
@@ -6,7 +6,10 @@
 @use '../core/tokens/m2/mat/expansion' as tokens-mat-expansion;
 
 @mixin base($theme) {
-  // TODO(mmalerba): Move expansion panel base tokens here
+  @include sass-utils.current-selector-or-root() {
+    @include token-utils.create-token-values(
+        tokens-mat-expansion.$prefix, tokens-mat-expansion.get-unthemable-tokens());
+  }
 }
 
 @mixin color($theme) {
diff --git a/src/material/expansion/expansion-panel.scss b/src/material/expansion/expansion-panel.scss
index ce870070b051..0995142c76ac 100644
--- a/src/material/expansion/expansion-panel.scss
+++ b/src/material/expansion/expansion-panel.scss
@@ -6,8 +6,6 @@
 @use '../core/style/elevation';
 
 .mat-expansion-panel {
-  @include token-utils.create-token-values(
-    tokens-mat-expansion.$prefix, tokens-mat-expansion.get-unthemable-tokens());
   @include elevation.overridable-elevation(2);
   box-sizing: content-box;
   display: block;