diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 3baf117..beec244 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -144,7 +144,7 @@ function _menu_ui_node_save(NodeInterface $node, array $values) {
     // Create a new menu_link_content entity.
     $entity = entity_create('menu_link_content', array(
       'link' => ['uri' => 'entity:node/' . $node->id()],
-      'langcode' => $node->getUntranslated()->language()->getId(),
+      'langcode' => $node->language()->getId(),
     ));
     $entity->enabled->value = 1;
   }
@@ -197,6 +197,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) {
       $query = \Drupal::entityQuery('menu_link_content')
         ->condition('link.uri', 'node/' . $node->id())
         ->condition('menu_name', $menu_name)
+        ->condition('langcode', $node->language()->getId())
         ->sort('id', 'ASC')
         ->range(0, 1);
       $result = $query->execute();
@@ -208,6 +209,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) {
       $query = \Drupal::entityQuery('menu_link_content')
         ->condition('link.uri', 'entity:node/' . $node->id())
         ->condition('menu_name', array_values($type_menus), 'IN')
+        ->condition('langcode', $node->language()->getId())
         ->sort('id', 'ASC')
         ->range(0, 1);
       $result = $query->execute();