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 9c16b99..be425b4 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
@@ -7,6 +7,7 @@
 
 namespace Drupal\menu_link\Plugin\Core\Entity;
 
+use Drupal;
 use Drupal\menu_link\MenuLinkInterface;
 use Symfony\Component\Routing\Route;
 
@@ -257,7 +258,12 @@ public function id() {
    * {@inheritdoc}
    */
   public function bundle() {
-    return $this->menu_name;
+    // If the bundle key is set - use it.
+    $entity_info = Drupal::entityManager()->getDefinition($this->entityType());
+    if (!empty($entity_info['entity_keys']['bundle'])) {
+      return $this->{$entity_info['entity_keys']['bundle']};
+    }
+    return parent::bundle();
   }
 
   /**