diff --git a/lib/timeline/Timeline.js b/lib/timeline/Timeline.js
index b4ac6773..ba83f36f 100644
--- a/lib/timeline/Timeline.js
+++ b/lib/timeline/Timeline.js
@@ -184,8 +184,8 @@ function Timeline (container, items, groups, options) {
   //Single time autoscale/fit
   this.initialFitDone = false;
   this.on('changed', function (){
-    if (me.itemsData == null || me.options.rollingMode) return;
-    if (!me.initialFitDone) {
+    if (me.itemsData == null) return;
+    if (!me.initialFitDone || !me.options.rollingMode) {
       me.initialFitDone = true;
       if (me.options.start != undefined || me.options.end != undefined) {
         if (me.options.start == undefined || me.options.end == undefined) {
@@ -200,7 +200,7 @@ function Timeline (container, items, groups, options) {
       }
     }
 
-    if (!me.initialDrawDone && (me.initialRangeChangeDone || (!me.options.start && !me.options.end))) {
+    if (!me.initialDrawDone && (me.initialRangeChangeDone || (!me.options.start && !me.options.end) || me.options.rollingMode)) {
       me.initialDrawDone = true;
       me.dom.root.style.visibility = 'visible';
       me.dom.loadingScreen.parentNode.removeChild(me.dom.loadingScreen);