diff --git a/src/Collector/NoCommerceSyliusCollector.php b/src/Collector/NoCommerceSyliusCollector.php
index fa21df9..31904b3 100644
--- a/src/Collector/NoCommerceSyliusCollector.php
+++ b/src/Collector/NoCommerceSyliusCollector.php
@@ -107,7 +107,7 @@ public function getDefaultLocaleCode(): ?string
      * @SuppressWarnings(PHPMD.EmptyCatchBlock)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function collect(Request $request, Response $response, Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?Throwable $exception = null): void
     {
         try {
             /** @var ChannelInterface $channel */
diff --git a/src/Kernel/SyliusNoCommerceKernelTrait.php b/src/Kernel/SyliusNoCommerceKernelTrait.php
index 3fc57cd..44dfd88 100644
--- a/src/Kernel/SyliusNoCommerceKernelTrait.php
+++ b/src/Kernel/SyliusNoCommerceKernelTrait.php
@@ -216,7 +216,7 @@ public function loadRoutes(LoaderInterface $loader): RouteCollection
         foreach ($collection as $name => $route) {
             foreach ($routesToRemove as $routeToRemove) {
                 if (false !== strpos($name, $routeToRemove)) {
-                    $route->setCondition("not(context.getPathInfo() matches '`^%sylius.security.new_api_route%`') and not context.checkNoCommerce()");
+                    $route->setCondition('not context.checkNoCommerce()');
                 }
             }
         }
diff --git a/src/Provider/FeaturesProvider.php b/src/Provider/FeaturesProvider.php
index 8abd13c..de70ad3 100644
--- a/src/Provider/FeaturesProvider.php
+++ b/src/Provider/FeaturesProvider.php
@@ -32,7 +32,7 @@ public function __construct(
         $this->nocommerceSettings = $nocommerceSettings;
     }
 
-    public function isNoCommerceEnabledForChannel(ChannelInterface $channel = null): bool
+    public function isNoCommerceEnabledForChannel(?ChannelInterface $channel = null): bool
     {
         try {
             if (null === $channel) {
diff --git a/src/Provider/FeaturesProviderInterface.php b/src/Provider/FeaturesProviderInterface.php
index 4ecae2a..f7706fe 100644
--- a/src/Provider/FeaturesProviderInterface.php
+++ b/src/Provider/FeaturesProviderInterface.php
@@ -17,5 +17,5 @@
 
 interface FeaturesProviderInterface
 {
-    public function isNoCommerceEnabledForChannel(ChannelInterface $channel = null): bool;
+    public function isNoCommerceEnabledForChannel(?ChannelInterface $channel = null): bool;
 }