diff --git a/js/src/popover.js b/js/src/popover.js
index fa22ea8c9e41..33768617c377 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -55,7 +55,7 @@ class Popover extends Tooltip {
 
   // Overrides
   _isWithContent() {
-    return Boolean(this._config.title || this._config.originalTitle || this._config.content)
+    return this._getTitle() || this._getContent()
   }
 
   // Private
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index ec0ea44e3bad..40158c4d6466 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -307,7 +307,7 @@ class Tooltip extends BaseComponent {
 
   // Protected
   _isWithContent() {
-    return Boolean(this._config.title || this._config.originalTitle)
+    return Boolean(this._getTitle())
   }
 
   _getTipElement() {