diff --git a/js/dist/popover.js b/js/dist/popover.js
index 5e057c0fe..9e7b6e839 100644
--- a/js/dist/popover.js
+++ b/js/dist/popover.js
@@ -104,10 +104,10 @@ var Popover = (function ($) {
         var tip = this.getTipElement();
         var title = this.getTitle();
         var content = this._getContent();
-        var titleElement = $(tip).find(Selector.TITLE)[0];
+        var $titleElement = $(tip).find(Selector.TITLE);
 
-        if (titleElement) {
-          titleElement[this.config.html ? 'innerHTML' : 'innerText'] = title;
+        if ($titleElement) {
+          $titleElement[this.config.html ? 'html' : 'text'](title);
         }
 
         // we use append for html objects to maintain js events
diff --git a/js/dist/popover.js.map b/js/dist/popover.js.map
index c4b9cf3ee..1fc2bb600 100644
Binary files a/js/dist/popover.js.map and b/js/dist/popover.js.map differ
diff --git a/js/dist/tooltip.js b/js/dist/tooltip.js
index a1bd76873..fd542f2ab 100644
--- a/js/dist/tooltip.js
+++ b/js/dist/tooltip.js
@@ -331,9 +331,9 @@ var Tooltip = (function ($) {
       value: function setContent() {
         var tip = this.getTipElement();
         var title = this.getTitle();
-        var method = this.config.html ? 'innerHTML' : 'innerText';
+        var method = this.config.html ? 'html' : 'text';
 
-        $(tip).find(Selector.TOOLTIP_INNER)[0][method] = title;
+        $(tip).find(Selector.TOOLTIP_INNER)[method](title);
 
         $(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
 
diff --git a/js/dist/tooltip.js.map b/js/dist/tooltip.js.map
index cf68704b5..0c2de9c5c 100644
Binary files a/js/dist/tooltip.js.map and b/js/dist/tooltip.js.map differ