diff --git a/polygerrit-ui/app/elements/shared/gr-limited-text/gr-limited-text.js b/polygerrit-ui/app/elements/shared/gr-limited-text/gr-limited-text.js
index bd993062be..eabe0615ec 100644
--- a/polygerrit-ui/app/elements/shared/gr-limited-text/gr-limited-text.js
+++ b/polygerrit-ui/app/elements/shared/gr-limited-text/gr-limited-text.js
@@ -54,7 +54,7 @@
      * enabled.
      */
     _updateTitle(text, limit) {
-      this.hasTooltip = !!limit && text.length > limit;
+      this.hasTooltip = !!limit && !!text && text.length > limit;
       if (this.hasTooltip) {
         this.setAttribute('title', text);
       } else {
@@ -63,7 +63,7 @@
     },
 
     _computeDisplayText(text, limit) {
-      if (!!limit && text.length > limit) {
+      if (!!limit && !!text && text.length > limit) {
         return text.substr(0, limit - 1) + '…';
       }
       return text;