diff --git a/samples/line-customTooltips.html b/samples/line-customTooltips.html
index 193fa3b82..75412d441 100644
--- a/samples/line-customTooltips.html
+++ b/samples/line-customTooltips.html
@@ -42,10 +42,11 @@
     <canvas id="chart1" width="300" height="100" />
   </div>
   <script>
+    window.count = 0;
     Chart.defaults.global.pointHitDetectionRadius = 1;
     var customTooltips = function(tooltip) {
 
-      console.log(tooltip);
+      console.log(window.count++, tooltip);
 
       // Tooltip Element
       var tooltipEl = $('#chartjs-tooltip');
diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 6663229f9..91592779a 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -459,6 +459,7 @@
 				// The usual updates
 				this.tooltip.initialize();
 				this.tooltip._active = this.tooltipActive;
+				this.tooltip.update();
 			}
 
 			// Hover animations
@@ -484,11 +485,12 @@
 					(this.lastTooltipActive.length !== this.tooltipActive.length) ||
 					changed) {
 
-					if (this.options.tooltips.enabled || this.options.tooltips.custom) {
-						this.tooltip.update();
-					}
 					this.stop();
 
+					if (this.options.tooltips.enabled || this.options.tooltips.custom) {
+						this.tooltip.update(true);
+					}
+
 					// We only need to render at this point. Updating will cause scales to be recomputed generating flicker & using more
 					// memory than necessary.
 					this.render(this.options.hover.animationDuration, true);
diff --git a/src/core/core.tooltip.js b/src/core/core.tooltip.js
index b8ec75b3a..b93bbe17b 100644
--- a/src/core/core.tooltip.js
+++ b/src/core/core.tooltip.js
@@ -193,7 +193,7 @@
 			return lines;
 		},
 
-		update: function() {
+		update: function(changed) {
 
 			var ctx = this._chart.ctx;
 
@@ -262,7 +262,7 @@
 				this._model.opacity = 0;
 			}
 
-			if (this._options.tooltips.custom) {
+			if (changed && this._options.tooltips.custom) {
 				this._options.tooltips.custom.call(this, this._model);
 			}
 
@@ -270,6 +270,7 @@
 		},
 		draw: function() {
 
+
 			var ctx = this._chart.ctx;
 			var vm = this._view;