diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php b/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php
index 5a10a41b..7cac6b83 100644
--- a/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php
+++ b/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php
@@ -66,10 +66,11 @@ class ConceptController extends ActionController
             $concept = $this->conceptRepository->findByIdentifier($conceptUid);
         }
         $teaserConceptUids = GeneralUtility::trimExplode(',', $this->settings['additionalConceptUids']);
-        array_unshift($teaserConceptUids, $concept->getUid());
-        $filterSettings = [
-            'conceptUids' => $teaserConceptUids,
-        ];
+        if (null !== $concept) {
+            array_unshift($teaserConceptUids, $concept->getUid());
+        }
+        $filterSettings = new FilterSettings();
+        $filterSettings->setConceptUids($teaserConceptUids);
         $excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'], true);
         $limit = $this->settings['showMoreLink'] ? 4 : 0;
         $teasers = $this->productDataService->getTeasergroup($filterSettings, $excludedConceptUids, $limit);