diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3907a19ae..c0dafdad5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 
 #### What's Fixed
 - Fixed repeat mode not restoring on startup
+- Fixed rewinding not occuring when skipping back at the beginning of the queue if
+rewind before skipping was turned off
 
 #### What's Changed
 - For the time being, the media notification will not follow Album Covers or 1:1 Covers settings
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 8413738b9..2898e4237 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
@@ -270,8 +270,10 @@ class ExoPlaybackStateHolder(
     override fun prev() {
         if (playbackSettings.rewindWithPrev) {
             player.seekToPrevious()
-        } else {
+        } else if (player.hasPreviousMediaItem()) {
             player.seekToPreviousMediaItem()
+        } else {
+            player.seekTo(0)
         }
         if (!playbackSettings.rememberPause) {
             player.play()