Compatible Magento 2.4.2

Author: Shinichi69

Block/Sitemap.php

@@ -170,15 +170,24 @@ public function getCategoryUrl($categoryId)
 
     /**
      * Get page collection
-     * @return mixed
+     *
+     * @return PageCollection
+     * @throws NoSuchEntityException
      */
     public function getPageCollection()
     {
-        return $this->pageCollection->addFieldToFilter('is_active', Page::STATUS_ENABLED)
-            ->addStoreFilter($this->_storeManager->getStore())
-            ->addFieldToFilter('identifier', [
+        $excludePages   = $this->_helper->getExcludePageListing();
+        $pageCollection = $this->pageCollection->addFieldToFilter('is_active', Page::STATUS_ENABLED)
+            ->addStoreFilter($this->_storeManager->getStore());
+
+
+        if ($this->_helper->isEnableExcludePage() && !empty($excludePages)) {
+            $pageCollection->addFieldToFilter('identifier', [
                 'nin' => $this->getExcludedPages()
             ]);
+        }
+
+        return $pageCollection;
     }
 
     /**
@@ -187,11 +196,7 @@ public function getPageCollection()
      */
     public function getExcludedPages()
     {
-        if ($this->_helper->isEnableExcludePage()) {
-            return explode(',', $this->_helper->getExcludePageListing());
-        }
-
-        return ['home', 'no-route'];
+        return explode(',', $this->_helper->getExcludePageListing());
     }
 
     /**

Model/Source/Page.php

@@ -51,9 +51,14 @@ public function __construct(CollectionFactory $pageCollectionFactory)
      */
     public function toOptionArray()
     {
-        $options = [];
+        $options[] = [
+            'value' => '',
+            'label' => __('-- Please select --')
+        ];
+
         /** @var Collection $collection */
         $collection = $this->_pageCollectionFactory->create();
+
         foreach ($collection as $item) {
             $options[] = ['value' => $item->getIdentifier(), 'label' => $item->getTitle()];
         }