diff --git a/core/.eslintrc.passing.json b/core/.eslintrc.passing.json
index b013f1445a..a67ca794f1 100644
--- a/core/.eslintrc.passing.json
+++ b/core/.eslintrc.passing.json
@@ -12,7 +12,6 @@
     "no-multi-assign": "off",
     "no-mixed-operators": "off",
     "no-lonely-if": "off",
-    "no-empty": "off",
     "no-continue": "off",
     "no-confusing-arrow": "off",
     "newline-per-chained-call": "off",
diff --git a/core/modules/quickedit/js/models/FieldModel.es6.js b/core/modules/quickedit/js/models/FieldModel.es6.js
index 776c331f32..b7e6a2dfc1 100644
--- a/core/modules/quickedit/js/models/FieldModel.es6.js
+++ b/core/modules/quickedit/js/models/FieldModel.es6.js
@@ -218,17 +218,12 @@
         // different view mode).
         .where({ logicalFieldID: currentField.get('logicalFieldID') })
         .forEach((field) => {
-          // Ignore the current field.
-          if (field === currentField) {
-
+          // Ignore the current field and other fields with the same view mode.
+          if (field === currentField || field.get('fieldID') === currentField.get('fieldID')) {
+            return;
           }
-          // Also ignore other fields with the same view mode.
-          else if (field.get('fieldID') === currentField.get('fieldID')) {
 
-          }
-          else {
-            otherViewModes.push(field.getViewMode());
-          }
+          otherViewModes.push(field.getViewMode());
         });
       return otherViewModes;
     },
diff --git a/core/modules/quickedit/js/models/FieldModel.js b/core/modules/quickedit/js/models/FieldModel.js
index f3c6cd582c..e81fc33388 100644
--- a/core/modules/quickedit/js/models/FieldModel.js
+++ b/core/modules/quickedit/js/models/FieldModel.js
@@ -72,9 +72,11 @@
       var currentField = this;
       var otherViewModes = [];
       Drupal.quickedit.collections.fields.where({ logicalFieldID: currentField.get('logicalFieldID') }).forEach(function (field) {
-        if (field === currentField) {} else if (field.get('fieldID') === currentField.get('fieldID')) {} else {
-            otherViewModes.push(field.getViewMode());
-          }
+        if (field === currentField || field.get('fieldID') === currentField.get('fieldID')) {
+          return;
+        }
+
+        otherViewModes.push(field.getViewMode());
       });
       return otherViewModes;
     }