diff --git a/modules/contrib/simple_sitemap/src/Batch/EntityUrlGenerator.php b/modules/contrib/simple_sitemap/src/Batch/EntityUrlGenerator.php
index 59a8ee9..dd65d6e 100644
--- a/modules/contrib/simple_sitemap/src/Batch/EntityUrlGenerator.php
+++ b/modules/contrib/simple_sitemap/src/Batch/EntityUrlGenerator.php
@@ -39,12 +39,16 @@
           $url_object = $entity->toUrl();
       }
 
-      // Do not include external paths.
+      // Treat base:/ paths
       if (!$url_object->isRouted()) {
-        continue;
+        if (strpos($url_object->getUri(), 'base:/') !== FALSE) {
+          $path = $url_object->setAbsolute()->toString();
+        } else {
+          continue;
+        }
+      } else {
+        $path = $url_object->getInternalPath();
       }
-
-      $path = $url_object->getInternalPath();
 
       // Do not include paths that have been already indexed.
       if ($this->batchInfo['remove_duplicates'] && $this->pathProcessed($path)) {
diff --git a/modules/contrib/simple_sitemap/src/EntityHelper.php b/modules/contrib/simple_sitemap/src/EntityHelper.php
index de42c22..7ff107e 100644
--- a/modules/contrib/simple_sitemap/src/EntityHelper.php
+++ b/modules/contrib/simple_sitemap/src/EntityHelper.php
@@ -105,12 +105,29 @@
    * @return object|null
    */
   public function getEntityFromUrlObject(Url $url_object) {
-    $route_parameters = $url_object->getRouteParameters();
-    return !empty($route_parameters) && $this->entityTypeManager
+    // Routed menu case
+    if ($url_object->isRouted()) {
+      $route_parameters = $url_object->getRouteParameters();
+      return !empty($route_parameters) && $this->entityTypeManager
       ->getDefinition($entity_type_id = key($route_parameters), FALSE)
       ? $this->entityTypeManager->getStorage($entity_type_id)
         ->load($route_parameters[$entity_type_id])
       : NULL;
+    } else if (strpos($url_object->getUri(), 'base:/') !== FALSE) {
+      // Non routed base:/ case for menu link content
+      $entity_type_id = 'menu_link_content';
+      $query = \Drupal::entityQuery($entity_type_id)
+        ->condition('link.uri', $url_object->getUri());
+      $result = $query->execute();
+      $id = (!empty($result)) ? reset($result) : FALSE;
+      if (!empty($id)) {
+        $menuEntityItem = $this->entityTypeManager->getStorage($entity_type_id)
+        ->load($id);
+        return $menuEntityItem;
+      } else {
+        return NULL;
+      }
+    }
   }
 
   /**