diff --git a/composer.json b/composer.json
index 0c5e7c1..fe4a47c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "netlogix/neos-content",
     "description": "This plugin enables Shopware templates to be designed with an Enterprise CMS.",
-    "version": "0.1.27",
+    "version": "0.1.28",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "autoload": {
diff --git a/src/Service/ResolverContextService.php b/src/Service/ResolverContextService.php
index 15d2c3e..7fe5383 100644
--- a/src/Service/ResolverContextService.php
+++ b/src/Service/ResolverContextService.php
@@ -142,6 +142,7 @@ private function getCategoryResolverContextFromCategoryId(
         $criteria = new Criteria([$categoryId]);
         $criteria->setTitle('category::data');
         $criteria->addAssociation('media.media');
+        $criteria->setLimit(1);
         $category = $this->categoryRepository
             ->search($criteria, $context)
             ->get($categoryId);
diff --git a/src/Storefront/Controller/NeosPageController.php b/src/Storefront/Controller/NeosPageController.php
index 197e8b2..87ef543 100644
--- a/src/Storefront/Controller/NeosPageController.php
+++ b/src/Storefront/Controller/NeosPageController.php
@@ -38,10 +38,10 @@ function index(Request $request, SalesChannelContext $salesChannelContext): Resp
         }
 
         $resolverContext = $this->resolverContextService->getResolverContextForEntityNameAndId(
-            CategoryDefinition::ENTITY_NAME,
-            '019a7c22388f72efbf7c5219977ba492',
-            $salesChannelContext,
-            $request
+            entityName: CategoryDefinition::ENTITY_NAME,
+            entityId: $salesChannelContext->getSalesChannel()->getNavigationCategoryId(),
+            context: $salesChannelContext,
+            request: $request,
         );
         $this->contentExchangeService->loadSlotData($sections->getBlocks(), $resolverContext);
         $cmsPage = new CmsPageEntity();