diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx
index ac4f57ce2a..39c86405c9 100644
--- a/web/react/components/channel_loader.jsx
+++ b/web/react/components/channel_loader.jsx
@@ -84,8 +84,6 @@ export default class ChannelLoader extends React.Component {
});
});
- $('body').tooltip({selector: '[data-toggle=tooltip]', trigger: 'hover click'});
-
$('body').on('mouseenter mouseleave', '.post', function mouseOver(ev) {
if (ev.type === 'mouseenter') {
$(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after');
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index 8ad2336fb0..824e7ef397 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -5,6 +5,8 @@ var UserStore = require('../stores/user_store.jsx');
var utils = require('../utils/utils.jsx');
var Constants = require('../utils/constants.jsx');
+var Tooltip = ReactBootstrap.Tooltip;
+var OverlayTrigger = ReactBootstrap.OverlayTrigger;
export default class PostInfo extends React.Component {
constructor(props) {
@@ -148,17 +150,19 @@ export default class PostInfo extends React.Component {
var dropdown = this.createDropdown();
+ let tooltip =