diff --git a/core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php b/core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php
index 8a2f077..7e47c85 100644
--- a/core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php
+++ b/core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php
@@ -30,24 +30,26 @@ public function validate($entity, Constraint $constraint) {
         $violation_path = 'menu';
       }
       // Handle the case when the menu link is deleted in a forward revision.
-      elseif ($defaults['entity_id'] && empty($values['enabled'] && $values['entity_id'])) {
+      elseif (empty($values['enabled']) && $defaults['entity_id']) {
         $violation_path = 'menu';
       }
       // Handle all the other menu link changes in a forward revision.
-      elseif (($values['title'] != $defaults['title'])) {
-        $violation_path = 'menu.title';
-      }
-      elseif (($values['description'] != $defaults['description'])) {
-        $violation_path = 'menu.description';
-      }
-      elseif ($defaults['entity_id'] && ($values['menu_name'] != $defaults['menu_name'])) {
-        $violation_path = 'menu.menu_parent';
-      }
-      elseif (isset($values['parent']) && ($values['parent'] != $defaults['parent'])) {
-        $violation_path = 'menu.menu_parent';
-      }
-      elseif (($values['weight'] != $defaults['weight'])) {
-        $violation_path = 'menu.weight';
+      elseif ($defaults['entity_id']) {
+        if (($values['title'] != $defaults['title'])) {
+          $violation_path = 'menu.title';
+        }
+        elseif (($values['description'] != $defaults['description'])) {
+          $violation_path = 'menu.description';
+        }
+        elseif ($defaults['entity_id'] && ($values['menu_name'] != $defaults['menu_name'])) {
+          $violation_path = 'menu.menu_parent';
+        }
+        elseif (isset($values['parent']) && ($values['parent'] != $defaults['parent'])) {
+          $violation_path = 'menu.menu_parent';
+        }
+        elseif (($values['weight'] != $defaults['weight'])) {
+          $violation_path = 'menu.weight';
+        }
       }
 
       if ($violation_path) {