diff --git a/js/tooltip.js b/js/tooltip.js
index 38940a384d..c62a5061a4 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -202,10 +202,10 @@
         var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
 
         this.applyPlacement(calculatedOffset, placement)
-        this.hoverState = null
 
         var complete = function () {
           that.$element.trigger('shown.bs.' + that.type)
+          that.hoverState = null
         }
 
         $.support.transition && this.$tip.hasClass('fade') ?