diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index f397b1f7167d..18a58d5b8e87 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -220,7 +220,11 @@ class Tooltip extends BaseComponent {
       return
     }
 
-    this.tip.remove() // todo v6 remove this OR make it optional
+    // todo v6 remove this OR make it optional
+    if (this.tip) {
+      this.tip.remove()
+    }
+
     const tip = this._getTipElement()
 
     this._element.setAttribute('aria-describedby', tip.getAttribute('id'))