diff --git a/public/typo3conf/ext/ep_theme/Classes/DataProcessing/ContextProcessor.php b/public/typo3conf/ext/ep_theme/Classes/DataProcessing/ContextProcessor.php
index 46ad837a..5a265bd8 100644
--- a/public/typo3conf/ext/ep_theme/Classes/DataProcessing/ContextProcessor.php
+++ b/public/typo3conf/ext/ep_theme/Classes/DataProcessing/ContextProcessor.php
@@ -118,7 +118,7 @@ class ContextProcessor implements DataProcessorInterface
      */
     private function getCookieData()
     {
-        if (isset($_COOKIE['ep_trk']) && preg_match('/^PA\d{4}$/', $_COOKIE['ep_trk'])) {
+        if (isset($_COOKIE['ep_trk']) && preg_match('/^PA\d{3,4}$/', $_COOKIE['ep_trk'])) {
             return $_COOKIE['ep_trk'];
         }
 
diff --git a/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php b/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php
index d3722cc1..5fa93605 100644
--- a/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php
+++ b/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php
@@ -50,7 +50,7 @@ class TrackingMiddleware implements MiddlewareInterface
 
     const COOKIE_NAME = 'ep_trk';
     const COOKIE_TTL = 30;
-    const CODE_PATTERN = '([a-z]{4}|PA)\d{4}';
+    const CODE_PATTERN = '([a-z]{4}|PA)\d{3,4}';
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {