diff --git a/android/app/src/main/java/com/fabledsword/minstrel/player/ui/NowPlayingScreen.kt b/android/app/src/main/java/com/fabledsword/minstrel/player/ui/NowPlayingScreen.kt
index 72a648c7..ac21a6ef 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/player/ui/NowPlayingScreen.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/player/ui/NowPlayingScreen.kt
@@ -751,7 +751,7 @@ private fun TransportRow(
 @Composable
 private fun rememberUpnpVolumeKeyHandler(activeUpnp: ActiveUpnp?): (KeyEvent) -> Boolean {
     val scope = rememberCoroutineScope()
-    val cache = remember { VolumeCache() }
+    val cache = remember(activeUpnp?.routeId) { VolumeCache() }
     return remember(activeUpnp) {
         handler@{ event: KeyEvent ->
             val rc = activeUpnp?.rendering ?: return@handler false