diff --git a/src/core/player.cpp b/src/core/player.cpp
index 96e7bdf9..0cf7a3c7 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -397,6 +397,11 @@ void Player::NextItem(const EngineBase::TrackChangeFlags change, const Playlist:
     }
   }
 
+  if (nb_errors_received_ >= 100) {
+    Stop();
+    return;
+  }
+
   // Manual track changes override "Repeat track"
   const bool ignore_repeat_track = change & EngineBase::TrackChangeType::Manual;