diff --git a/bundle/PlatformAdminUI/EventListener/SetPageLayoutListener.php b/bundle/PlatformAdminUI/EventListener/SetPageLayoutListener.php
index ccf02b23..34254c41 100644
--- a/bundle/PlatformAdminUI/EventListener/SetPageLayoutListener.php
+++ b/bundle/PlatformAdminUI/EventListener/SetPageLayoutListener.php
@@ -52,7 +52,12 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        $siteAccess = $event->getRequest()->attributes->get('siteaccess')->name;
+        $request = $event->getRequest();
+        if (!$request->attributes->has('siteaccess')) {
+            return;
+        }
+
+        $siteAccess = $request->attributes->get('siteaccess')->name;
         if (!isset($this->groupsBySiteAccess[$siteAccess])) {
             return;
         }
diff --git a/doc/changelogs/CHANGELOG-3.x.md b/doc/changelogs/CHANGELOG-3.x.md
index f60101f6..e82d416e 100644
--- a/doc/changelogs/CHANGELOG-3.x.md
+++ b/doc/changelogs/CHANGELOG-3.x.md
@@ -1,6 +1,11 @@
 Netgen Tags Bundle 3.x changelog
 ================================
 
+3.4.8 (09.11.2020)
+------------------
+
+* Make sure siteaccess exists in request before using it in `SetPageLayoutListener`
+
 3.4.7 (06.11.2020)
 ------------------
 
diff --git a/doc/changelogs/CHANGELOG-4.x.md b/doc/changelogs/CHANGELOG-4.x.md
index be6aa375..7a9200de 100644
--- a/doc/changelogs/CHANGELOG-4.x.md
+++ b/doc/changelogs/CHANGELOG-4.x.md
@@ -1,6 +1,11 @@
 Netgen Tags Bundle 4.x changelog
 ================================
 
+4.0.5 (09.11.2020)
+------------------
+
+* Make sure siteaccess exists in request before using it in `SetPageLayoutListener`
+
 4.0.4 (06.11.2020)
 ------------------