diff --git a/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php b/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php
index d7f75510..18f9b83f 100644
--- a/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php
+++ b/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php
@@ -138,22 +138,23 @@ class TrackingMiddleware implements MiddlewareInterface
         $params = $request->getAttribute('normalizedParams');
         $query = $params->getQueryString();
         $path = $params->getRequestUri();
-        if (preg_match('/(' . static::CODE_PATTERN . ')\/?$/i', $path)) {
-            $urlItems = GeneralUtility::trimExplode('/', $path, true);
-            $code = array_pop($urlItems);
-            $this->setCookie($code);
-            $uri = '/';
-            if (count($urlItems) > 0) {
-                $uri = '/' . implode('/', $urlItems) . '/';
-            }
-            if (!empty($query)) {
-                $uri .= '?' . $query;
-            }
 
-            return $uri;
+        if (!preg_match('/^(' . static::CODE_PATTERN . ')\/?$/i', $path)) {
+            return null;
         }
 
-        return null;
+        $urlItems = GeneralUtility::trimExplode('/', $path, true);
+        $code = array_pop($urlItems);
+        $this->setCookie($code);
+        $uri = '/';
+        if (count($urlItems) > 0) {
+            $uri = '/' . implode('/', $urlItems) . '/';
+        }
+        if (!empty($query)) {
+            $uri .= '?' . $query;
+        }
+
+        return $uri;
     }
 
     /**