diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
index e08d7a5b97a6d..1691c53386d68 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
@@ -323,10 +323,6 @@ public class MediaControlPanel {
             setVisibleAndAlpha(collapsedSet, R.id.media_seamless, true /*visible */);
             setVisibleAndAlpha(expandedSet, R.id.media_seamless, true /*visible */);
             updateDevice(mLocalMediaManager.getCurrentConnectedDevice());
-            if (mViewHolder.getBackground().getBackground() instanceof IlluminationDrawable) {
-                    ((IlluminationDrawable) mViewHolder.getBackground().getBackground())
-                            .setupTouch(mViewHolder.getSeamless(), mViewHolder.getPlayer());
-            }
             mViewHolder.getSeamless().setOnClickListener(v -> {
                 final Intent intent = new Intent()
                         .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
@@ -358,11 +354,6 @@ public class MediaControlPanel {
             button.setContentDescription(mediaAction.getContentDescription());
             PendingIntent actionIntent = mediaAction.getIntent();
 
-            if (mViewHolder.getBackground().getBackground() instanceof IlluminationDrawable) {
-                ((IlluminationDrawable) mViewHolder.getBackground().getBackground())
-                        .setupTouch(button, mViewHolder.getPlayer());
-            }
-
             button.setOnClickListener(v -> {
                 if (actionIntent != null) {
                     try {
diff --git a/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt
index 571e18d0ff20f..764dbe6d428f7 100644
--- a/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt
@@ -60,6 +60,17 @@ class PlayerViewHolder private constructor(itemView: View) {
     val action3 = itemView.requireViewById<ImageButton>(R.id.action3)
     val action4 = itemView.requireViewById<ImageButton>(R.id.action4)
 
+    init {
+        (background.background as IlluminationDrawable).let {
+            it.setupTouch(seamless, player)
+            it.setupTouch(action0, player)
+            it.setupTouch(action1, player)
+            it.setupTouch(action2, player)
+            it.setupTouch(action3, player)
+            it.setupTouch(action4, player)
+        }
+    }
+
     fun getAction(id: Int): ImageButton {
         return when (id) {
             R.id.action0 -> action0