diff --git a/lib/timeline/Core.js b/lib/timeline/Core.js
index 8ece3c41..1eeb0faa 100644
--- a/lib/timeline/Core.js
+++ b/lib/timeline/Core.js
@@ -116,18 +116,10 @@ Core.prototype._create = function (container) {
 
   var me = this;
   this.on('_change', function (properties) {
-    if (properties && properties.queue == true) {
-      // redraw once on next tick
-      if (!me._redrawTimer) {
-        me._redrawTimer = setTimeout(function () {
-          me._redrawTimer = null;
-          me._redraw();
-        }, 0)
-      }
-    }
-    else {
-      // redraw immediately
-      me._redraw();
+    if (me.itemSet.initialItemSetDrawn && properties && properties.queue == true) {
+      me._redraw()
+    } else {
+      me._origRedraw();
     }
   });
 
diff --git a/lib/timeline/component/ItemSet.js b/lib/timeline/component/ItemSet.js
index 3f64c0e4..ed27f48a 100644
--- a/lib/timeline/component/ItemSet.js
+++ b/lib/timeline/component/ItemSet.js
@@ -648,6 +648,7 @@ ItemSet.prototype.redraw = function() {
     this.dom.axis.style.left = '0';
   }
 
+  this.initialItemSetDrawn = true;
   // check if this component is resized
   resized = this._isResized() || resized;