diff --git a/src/leaflet.timedimension.player.js b/src/leaflet.timedimension.player.js
index 6bef45c..f2d2dee 100644
--- a/src/leaflet.timedimension.player.js
+++ b/src/leaflet.timedimension.player.js
@@ -48,7 +48,7 @@ L.TimeDimension.Player = (L.Layer || L.Class).extend({
             return;
         }
         var numberNextTimesReady = 0,
-            buffer = this._bufferSize;
+            buffer = Math.min(this._bufferSize, this._getMaxIndex());
 
         if (this._minBufferReady > 0) {
             numberNextTimesReady = this._timeDimension.getNumberNextTimesReady(this._steps, buffer, this._loop);