diff --git a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
index 1a787b85d..1e949366d 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
@@ -31,6 +31,11 @@ import org.oxycblt.auxio.util.androidActivityViewModels
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.formatDuration
 
+/**
+ * A dialog displayed when "View properties" is selected on a song, showing more information about
+ * the properties of the audio file itself.
+ * @author OxygenCobalt
+ */
 class SongDetailDialog : ViewBindingDialogFragment<DialogSongDetailBinding>() {
     private val detailModel: DetailViewModel by androidActivityViewModels()
     private val args: SongDetailDialogArgs by navArgs()
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
index b66400016..d96e3012b 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
@@ -282,6 +282,14 @@ class PlaybackViewModel(application: Application) :
         }
     }
 
+    /** Wipe the saved playback state (if any). */
+    fun wipePlaybackState(onDone: () -> Unit) {
+        viewModelScope.launch {
+            playbackManager.wipeState(PlaybackStateDatabase.getInstance(application))
+            onDone()
+        }
+    }
+
     /**
      * Force restore the last [PlaybackStateManager] saved state, regardless of if a library exists
      * or not. [onDone] will be called with true if it was successfully done, or false if there was
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
index 4df354b76..abd1f1504 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
@@ -186,19 +186,17 @@ class PlaybackStateDatabase private constructor(context: Context) :
     }
 
     /** Clear the previously written [SavedState] and write a new one. */
-    fun write(state: SavedState) {
+    fun write(state: SavedState?) {
         requireBackgroundThread()
 
-        val song = state.queue.getOrNull(state.index)
-
-        if (song != null) {
+        if (state != null && state.index in state.queue.indices) {
             val rawState =
                 RawState(
                     index = state.index,
                     positionMs = state.positionMs,
                     repeatMode = state.repeatMode,
                     isShuffled = state.isShuffled,
-                    songId = song.id,
+                    songId = state.queue[state.index].id,
                     parentId = state.parent?.id,
                     playbackMode =
                         when (state.parent) {
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
index 1ba47ed3a..fc4c363cc 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
@@ -388,12 +388,15 @@ class PlaybackStateManager private constructor() {
     /** Save the current state to the [database]. */
     suspend fun saveState(database: PlaybackStateDatabase) {
         logD("Saving state to DB")
-
         val state = synchronized(this) { makeStateImpl() }
-
         withContext(Dispatchers.IO) { database.write(state) }
     }
 
+    suspend fun wipeState(database: PlaybackStateDatabase) {
+        logD("Wiping state")
+        withContext(Dispatchers.IO) { database.write(null) }
+    }
+
     /** Sanitize the state with [newLibrary]. */
     @Synchronized
     fun sanitize(newLibrary: MusicStore.Library) {
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
index 51e09a115..87b3a2e60 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
@@ -49,8 +49,6 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat
 /**
  * The actual fragment containing the settings menu. Inherits [PreferenceFragmentCompat].
  * @author OxygenCobalt
- *
- * TODO: Add option to not restore state
  */
 @Suppress("UNUSED")
 class SettingsListFragment : PreferenceFragmentCompat() {
@@ -120,6 +118,9 @@ class SettingsListFragment : PreferenceFragmentCompat() {
             getString(R.string.set_key_save_state) -> {
                 playbackModel.savePlaybackState { context?.showToast(R.string.lbl_state_saved) }
             }
+            getString(R.string.set_key_wipe_state) -> {
+                playbackModel.wipePlaybackState { context?.showToast(R.string.lbl_state_wiped) }
+            }
             getString(R.string.set_key_restore_state) ->
                 playbackModel.tryRestorePlaybackState { restored ->
                     if (restored) {
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index 398f577a3..16e55339b 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -24,6 +24,7 @@
     <string name="set_key_repeat_pause" translatable="false">KEY_LOOP_PAUSE</string>
 
     <string name="set_key_save_state" translatable="false">auxio_save_state</string>
+    <string name="set_key_wipe_state" translatable="false">auxio_wipe_state</string>
     <string name="set_key_restore_state" translatable="false">auxio_restore_state</string>
     <string name="set_key_reindex" translatable="false">auxio_reindex</string>
     <string name="set_key_music_dirs" translatable="false">auxio_music_dirs</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 793dd025a..350240898 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,8 @@
     <!-- Referring to playback state -->
     <string name="lbl_state_saved">State saved</string>
     <!-- Referring to playback state -->
+    <string name="lbl_state_wiped">State cleared</string>
+    <!-- Referring to playback state -->
     <string name="lbl_state_restored">State restored</string>
 
     <!-- Limit to 10 characters -->
@@ -181,6 +183,8 @@
     <string name="set_content">Content</string>
     <string name="set_save">Save playback state</string>
     <string name="set_save_desc">Save the current playback state now</string>
+    <string name="set_wipe">Clear playback state</string>
+    <string name="set_wipe_desc">Wipe the previously saved playback state (if any)</string>
     <string name="set_restore">Restore playback state</string>
     <string name="set_restore_desc">Restore the previously saved playback state (if any)</string>
     <string name="set_reindex">Reload music</string>
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index 418e000e7..be075ef11 100644
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@@ -128,6 +128,11 @@
             app:summary="@string/set_save_desc"
             app:title="@string/set_save" />
 
+        <Preference
+            app:key="@string/set_key_wipe_state"
+            app:title="@string/set_wipe"
+            app:summary="@string/set_wipe_desc" />
+
         <Preference
             app:key="@string/set_key_restore_state"
             app:summary="@string/set_restore_desc"
diff --git a/info/FAQ.md b/info/FAQ.md
index d7a79bb88..878352a5a 100644
--- a/info/FAQ.md
+++ b/info/FAQ.md
@@ -51,7 +51,8 @@ a regression introduced by Google in that version. If this issue appears in anot
 **There should be one artist, but instead I get a bunch of "Artist & Collaborator" artists:** This likely means your tags are wrong. By default, Auxio will use the
 "album artist" tag for grouping if present, falling back to the "artist" tag otherwise. If your music does not have such a field, it will result in fragmented artists.
 The reason why Auxio does not simply parse for separators and then extract artists that way is that it risks mangling artists that don't actually have collaborators,
-such as "Black Country, New Road" becoming "Black Country".
+such as "Black Country, New Road" becoming "Black Country". I understand that some users may leverage MusicBrainz tags that enable a song to be referenced by several
+artists, but such functionality in Auxio will likely take awhile to implement to to UI and technical constraints.
 
 **Auxio does not detect new music:** This is Auxio's default behavior due to limitations regarding android's filesystem APIs. To enable such behavior, turn on
 "Automatic reloading" in settings. Note that this option does require a persistent notification and higher battery usage.