diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d3137720..d4048755d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,10 @@
 
 #### What's Improved
 - Auxio will now accept zeroed track/disc numbers in the presence of non-zero total
-track/disc fields.
+track/disc fields
 
+#### What's Fixed
+- Fixed non-functioning "repeat all" repeat mode
 
 ## 3.0.2
 
diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index b1550b8af..201abbd18 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -48,8 +48,6 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat
  *
  * TODO: Unit testing
  *
- * TODO: Migrate to value classes FOR ALL ENUMS
- *
  * @author Alexander Capehart (OxygenCobalt)
  */
 class MainActivity : AppCompatActivity() {
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 9e33877a2..fabeda51a 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
@@ -186,7 +186,7 @@ class PlaybackStateManager private constructor() {
         var play = true
         if (!queue.goto(queue.index + 1)) {
             queue.goto(0)
-            play = false
+            play = repeatMode == RepeatMode.ALL
         }
         notifyIndexMoved()
         internalPlayer.loadSong(queue.currentSong, play)