diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 857f72c8ad..de7dcca693 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -284,11 +284,11 @@ class Tooltip extends BaseComponent {
     EventHandler.trigger(this._element, this.constructor.Event.INSERTED)
 
     if (this._popper) {
-      this._popper.destroy()
+      this._popper.update()
+    } else {
+      this._popper = Popper.createPopper(this._element, tip, this._getPopperConfig(attachment))
     }
 
-    this._popper = Popper.createPopper(this._element, tip, this._getPopperConfig(attachment))
-
     tip.classList.add(CLASS_NAME_SHOW)
 
     const customClass = typeof this.config.customClass === 'function' ? this.config.customClass() : this.config.customClass