diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/ThemeSongPlayer.kt b/app/src/main/java/com/github/damontecres/wholphin/util/ThemeSongPlayer.kt
index de334ba3..8f5e7b9e 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/util/ThemeSongPlayer.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/util/ThemeSongPlayer.kt
@@ -32,6 +32,7 @@ class ThemeSongPlayer
             volume: ThemeSongVolume,
             url: String,
         ) {
+            stop()
             val volumeLevel =
                 when (volume) {
                     ThemeSongVolume.UNRECOGNIZED,
@@ -64,5 +65,6 @@ class ThemeSongPlayer
         fun stop() {
             player?.stop()
             player?.release()
+            player = null
         }
     }