diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index fbdac062e8..4ab6c3c5d2 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1663,10 +1663,10 @@ static int TrackGotoChunkSample( demux_t *p_demux, mp4_track_t *p_track,
     vlc_bool_t b_reselect = VLC_FALSE;
 
     /* now see if actual es is ok */
-    if( p_track->i_chunk < 0 ||
-        p_track->i_chunk >= p_track->i_chunk_count - 1 ||
-        p_track->chunk[p_track->i_chunk].i_sample_description_index !=
-            p_track->chunk[i_chunk].i_sample_description_index )
+    if( (p_track->i_chunk == 0) ||
+        (p_track->i_chunk >= p_track->i_chunk_count - 1) ||
+        (p_track->chunk[p_track->i_chunk].i_sample_description_index !=
+            p_track->chunk[i_chunk].i_sample_description_index) )
     {
         msg_Warn( p_demux, "recreate ES for track[Id 0x%x]",
                   p_track->i_track_ID );