diff --git a/crabidy-core/src/lib.rs b/crabidy-core/src/lib.rs
index 1e6c534..3f68780 100644
--- a/crabidy-core/src/lib.rs
+++ b/crabidy-core/src/lib.rs
@@ -65,7 +65,7 @@ impl Queue {
     }
 
     pub fn next_track(&mut self) -> Option<Track> {
-        if self.current_position < self.tracks.len() as u32 {
+        if self.current_position < self.tracks.len() as u32 - 1 {
             self.current_position += 1;
             Some(self.tracks[self.current_position as usize].clone())
         } else {