diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e6531a83..ef54ff22 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -44,4 +44,7 @@ jobs:
             - run: composer validate --strict
             - run: composer update --prefer-dist
             - run: vendor/bin/phpunit -c ${{ matrix.phpunit }} --colors=always --coverage-clover=coverage.xml
-            - run: bash <(curl -s https://codecov.io/bash) -F ${{ matrix.coverage }}
+            - name: Upload coverage to Codecov
+              uses: codecov/codecov-action@v3
+              with:
+                  token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/bundle/Routing/GeneratorRouter.php b/bundle/Routing/GeneratorRouter.php
index 0983b6b2..fda8dcb6 100644
--- a/bundle/Routing/GeneratorRouter.php
+++ b/bundle/Routing/GeneratorRouter.php
@@ -157,6 +157,10 @@ private function resolveSiteaccessAndGenerate(APILocation $location, array $para
             $siteaccess = $this->currentSiteaccess->name;
         }
 
+        if ($siteaccess === $this->currentSiteaccess->name) {
+            return $this->generator->generate($location, $parameters, $referenceType);
+        }
+
         $parameters['siteaccess'] = $siteaccess;
 
         $url = $this->generator->generate(