diff --git a/public/js/vroom.js b/public/js/vroom.js
index 1bab082..fe19770 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -1145,21 +1145,10 @@ function initVroom(room) {
   function checkMoh(){
     setTimeout(function(){
       if (countPeers() < 1){
-        if ($('.btn-moh:first').hasClass('btn-danger')){
+        if ($('.btn-moh').first().hasClass('btn-danger')){
           $('#mohPlayer').get(0).volume = .25;
           $('#mohPlayer').get(0).play();
         }
-        else{
-          $('.btn-moh').on('hidden.bs.popover', function(){
-            $('.btn-moh').popover('destroy');
-          });
-          setTimeout(function(){
-            $('.btn-moh').popover('show');
-          }, 200);
-          setTimeout(function(){
-            $('.btn-moh').popover('hide');
-          }, 5000);
-        }
         $('.aloneEl').show(200);
       }
     }, 3000);
@@ -1562,12 +1551,6 @@ function initVroom(room) {
         setTimeout(function(){
           $('#connecting').modal('hide');
         }, 200);
-        // Show MOH poup if the button is visible
-        if ($('.btn-moh:fist').css('display') !== 'none'){
-          $('.btn-moh').popover({
-            trigger: 'focus'
-          });
-        }
       }
     });
     checkMoh();
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index 54ef0ca..c4844c0 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -73,7 +73,7 @@
           </button>
         </div>
         <div class="btn-group navbar-form navbar-btn-group navbar-left hidden-xs aloneEl">
-          <button class="btn btn-lg btn-default btn-moh" data-toggle="popover" data-content="<%=l 'WAIT_WITH_MUSIC' %>" data-placement="bottom">
+          <button class="btn btn-lg btn-default btn-moh help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'WAIT_WITH_MUSIC' %>">
             <span class="glyphicon glyphicon-music">
             </span>
           </button>