diff --git a/src/core/tracklist/Standard.cpp b/src/core/tracklist/Standard.cpp
index 617802836..918d1f86b 100644
--- a/src/core/tracklist/Standard.cpp
+++ b/src/core/tracklist/Standard.cpp
@@ -101,7 +101,7 @@ void Standard::SetCurrentPosition(int position){
         this->currentPosition   = -1;
     }else{
         if(position >= (int)this->tracks.size()){
-            this->currentPosition   = this->tracks.size()-1;
+            this->currentPosition   = this->tracks.size();
         }else{
             this->currentPosition   = position;
         }