diff --git a/src/core/player.cpp b/src/core/player.cpp
index 6ac0008d2..258bbc8d0 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -425,12 +425,12 @@ bool Player::HandleStopAfter() {
 
 void Player::TrackEnded() {
 
-  if (HandleStopAfter()) return;
-
   if (current_item_ && current_item_->IsLocalCollectionItem() && current_item_->Metadata().id() != -1) {
     app_->playlist_manager()->collection_backend()->IncrementPlayCountAsync(current_item_->Metadata().id());
   }
 
+  if (HandleStopAfter()) return;
+
   NextInternal(Engine::Auto);
 
 }