diff --git a/Classes/Common/Solr/SolrSearch.php b/Classes/Common/Solr/SolrSearch.php
index 648b28f72..9fb8f08c3 100644
--- a/Classes/Common/Solr/SolrSearch.php
+++ b/Classes/Common/Solr/SolrSearch.php
@@ -124,7 +124,7 @@ public function __construct(
         $this->indexedMetadata = $indexedMetadata;
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
 
-        $this->documentRepository->useStoragePid($this->settings['storagePid']);
+        $this->documentRepository->useStoragePid((int) $this->settings['storagePid']);
     }
 
     /**
diff --git a/Classes/Controller/CollectionController.php b/Classes/Controller/CollectionController.php
index bbce009c3..c0b3f9cee 100644
--- a/Classes/Controller/CollectionController.php
+++ b/Classes/Controller/CollectionController.php
@@ -83,6 +83,8 @@ public function listAction(): ResponseInterface
             return $this->htmlResponse();
         }
 
+        $this->sanitizeSettings();
+
         $this->collectionRepository->useStoragePid($this->settings['storagePid']);
         $this->metadataRepository->useStoragePid($this->settings['storagePid']);