diff --git a/js/functions.js b/js/functions.js
index c76b4d6881..c31eda74c5 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1586,11 +1586,8 @@ function PMA_ajaxRemoveMessage($this_msgbox)
         .stop(true, true)
         .fadeOut('medium');
         if ($this_msgbox.is('.dismissable')) {
-            if ($('#no_hint').length < 0) {
-                // Here we should destroy the qtip instance, but
-                // due to a bug in qtip's implementation we can
-                // only hide it without throwing JS errors.
-                $this_msgbox.qtip('hide');
+            if ($.isFunction($this_msgbox.tooltip)) {
+                $this_msgbox.tooltip('destroy');
             }
         } else {
             $this_msgbox.remove();