diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt
index 491ae281c..d46c2435a 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt
@@ -548,7 +548,9 @@ class ExoPlaybackStateHolder(
 
     private fun save(cb: () -> Unit) {
         saveJob {
-            persistenceRepository.saveState(playbackManager.toSavedState())
+            if (sessionOngoing) {
+                persistenceRepository.saveState(playbackManager.toSavedState())
+            }
             withContext(Dispatchers.Main) { cb() }
         }
     }
@@ -559,7 +561,9 @@ class ExoPlaybackStateHolder(
             delay(SAVE_BUFFER)
             yield()
             L.d("Committing saved state")
-            persistenceRepository.saveState(playbackManager.toSavedState())
+            if (sessionOngoing) {
+                persistenceRepository.saveState(playbackManager.toSavedState())
+            }
         }
     }