diff --git a/src/tangara/ui/ui_fsm.cpp b/src/tangara/ui/ui_fsm.cpp
index 7da07215..a20eb0ef 100644
--- a/src/tangara/ui/ui_fsm.cpp
+++ b/src/tangara/ui/ui_fsm.cpp
@@ -436,6 +436,9 @@ void UiState::react(const audio::QueueUpdate& update) {
   if (queue_size > 0) {
     current_pos++;
   }
+  if (current_pos > queue_size) {
+    current_pos = queue_size;
+  }
   sQueuePosition.setDirect(current_pos);
   sQueueRandom.setDirect(queue.random());
   sQueueRepeat.setDirect(queue.repeat());