diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 8e0dfcb..f08cbc5 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -154,6 +154,7 @@ function menu_entity_info_alter(&$entity_info) {
     // During upgrades from 7.x to 8.x the menu_link module is enabled. Calls
     // to entity_info() before this occurs will not have the menu_link key set.
     $entity_info['menu_link']['entity_keys']['bundle'] = 'menu_name';
+    $entity_info['menu_link']['bundle_keys']['bundle'] = 'menu_name';
   }
 }
 
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
index 705e983..9c16b99 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
@@ -35,11 +35,7 @@
  *   entity_keys = {
  *     "id" = "mlid",
  *     "label" = "link_title",
- *     "uuid" = "uuid",
- *     "bundle" = "menu_name",
- *   },
- *   bundle_keys = {
- *     "bundle" = "menu_name"
+ *     "uuid" = "uuid"
  *   }
  * )
  */