diff --git a/connect/src/state/tracks.rs b/connect/src/state/tracks.rs
index 2ed8792b..94bde92b 100644
--- a/connect/src/state/tracks.rs
+++ b/connect/src/state/tracks.rs
@@ -296,7 +296,8 @@ impl<'ct> ConnectState {
                     delimiter
                 }
                 None if !matches!(self.fill_up_context, ContextType::Autoplay)
-                    && self.autoplay_context.is_some() =>
+                    && self.autoplay_context.is_some()
+                    && !self.repeat_context() =>
                 {
                     self.update_context_index(self.fill_up_context, new_index)?;