diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php
index e07149a5..bf81f13e 100644
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -4,7 +4,7 @@ use Shlinkio\Shlink\Rest\Middleware\BodyParserMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\CheckAuthenticationMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\CrossDomainMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\PathVersionMiddleware;
-use Zend\Expressive\Container\ApplicationFactory;
+use Zend\Expressive;
 use Zend\Stratigility\Middleware\ErrorHandler;
 
 return [
@@ -27,7 +27,7 @@ return [
 
         'routing' => [
             'middleware' => [
-                ApplicationFactory::ROUTING_MIDDLEWARE,
+                Expressive\Application::ROUTING_MIDDLEWARE,
             ],
             'priority' => 10,
         ],
@@ -36,6 +36,7 @@ return [
             'path' => '/rest',
             'middleware' => [
                 CrossDomainMiddleware::class,
+                Expressive\Middleware\ImplicitOptionsMiddleware::class,
                 BodyParserMiddleware::class,
                 CheckAuthenticationMiddleware::class,
             ],
@@ -44,7 +45,7 @@ return [
 
         'post-routing' => [
             'middleware' => [
-                ApplicationFactory::DISPATCH_MIDDLEWARE,
+                Expressive\Application::DISPATCH_MIDDLEWARE,
             ],
             'priority' => 1,
         ],
diff --git a/module/Rest/src/Middleware/CrossDomainMiddleware.php b/module/Rest/src/Middleware/CrossDomainMiddleware.php
index 0ce57e4f..4d73acbf 100644
--- a/module/Rest/src/Middleware/CrossDomainMiddleware.php
+++ b/module/Rest/src/Middleware/CrossDomainMiddleware.php
@@ -1,12 +1,13 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Middleware;
 
+use Fig\Http\Message\RequestMethodInterface;
 use Interop\Http\ServerMiddleware\DelegateInterface;
 use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
-class CrossDomainMiddleware implements MiddlewareInterface
+class CrossDomainMiddleware implements MiddlewareInterface, RequestMethodInterface
 {
     /**
      * Process an incoming server request and return a response, optionally delegating
@@ -28,7 +29,7 @@ class CrossDomainMiddleware implements MiddlewareInterface
         // Add Allow-Origin header
         $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeader('Origin'))
                              ->withHeader('Access-Control-Expose-Headers', 'Authorization');
-        if ($request->getMethod() !== 'OPTIONS') {
+        if ($request->getMethod() !== self::METHOD_OPTIONS) {
             return $response;
         }