diff --git a/src/Applications/UI/Queue.elm b/src/Applications/UI/Queue.elm
index 5cda645e..8c0e9eed 100644
--- a/src/Applications/UI/Queue.elm
+++ b/src/Applications/UI/Queue.elm
@@ -392,7 +392,7 @@ fillQueue timestamp availableTracks model =
                     m
            )
         |> (\m ->
-                if List.length model.future >= Fill.queueLength then
+                if m.shuffle && List.length model.future >= Fill.queueLength then
                     m
 
                 else