diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index 4935937f00..6b667c8ac8 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -1048,7 +1048,7 @@
     _computeReplyButtonLabel(changeRecord, canStartReview) {
       // Polymer 2: check for undefined
       if ([changeRecord, canStartReview].some(arg => arg === undefined)) {
-        return undefined;
+        return 'Reply';
       }
 
       if (canStartReview) {
diff --git a/polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog.js b/polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog.js
index eb6407d2fa..63586d04f2 100644
--- a/polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog.js
+++ b/polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog.js
@@ -159,7 +159,7 @@
     _computeSchemes(change, patchNum) {
       // Polymer 2: check for undefined
       if ([change, patchNum].some(arg => arg === undefined)) {
-        return undefined;
+        return [];
       }
 
       for (const rev of Object.values(change.revisions || {})) {
diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.js b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.js
index 2ba6da6ac4..08dcf51ca3 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.js
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.js
@@ -216,7 +216,7 @@
         newContent,
         saving,
       ].some(arg => arg === undefined)) {
-        return undefined;
+        return true;
       }
 
       if (saving) {
diff --git a/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js b/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js
index a0c4bae0df..29c2f6e652 100644
--- a/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js
+++ b/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js
@@ -124,7 +124,7 @@
         content,
         newContent,
       ].some(arg => arg === undefined)) {
-        return undefined;
+        return true;
       }
 
       return disabled || (content === newContent);