diff --git a/program/js/app.js b/program/js/app.js
index ae5cf6884..cab54dcd9 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -8346,7 +8346,7 @@ function rcube_webmail()
   this.set_quota = function(content)
   {
     if (this.gui_objects.quotadisplay && content && content.type == 'text')
-      $(this.gui_objects.quotadisplay).text((content.percent||0) + '%').attr('title', content.title);
+      $(this.gui_objects.quotadisplay).text((content.percent||0) + '%').attr('title', content.title || '');
 
     this.triggerEvent('setquota', content);
     this.env.quota_content = content;
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 0f9f33fe6..bf4719e75 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -3012,7 +3012,8 @@ function rcube_elastic_ui()
         }
 
         bar.find('.value').css('width', value + '%')[value >= 90 ? 'addClass' : 'removeClass']('warning');
-        element.attr('title', element.find('.count').attr('title'));
+        // set title and reset tooltip's data (needed in case of empty title)
+        element.attr({'data-original-title': '', title: element.find('.count').attr('title')});
 
         if (p.table) {
             element.css('cursor', 'pointer').data('popup-pos', 'top')