diff --git a/config/autoload/dependencies.global.php b/config/autoload/dependencies.global.php
index e2b88ba8..83a893dc 100644
--- a/config/autoload/dependencies.global.php
+++ b/config/autoload/dependencies.global.php
@@ -1,6 +1,8 @@
 <?php
+use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory;
 use Zend\Expressive;
 use Zend\Expressive\Container;
+use Zend\Expressive\Middleware;
 use Zend\Expressive\Router;
 use Zend\Expressive\Template;
 use Zend\Expressive\Twig;
@@ -15,6 +17,7 @@ return [
             \Twig_Environment::class => Twig\TwigEnvironmentFactory::class,
             Router\RouterInterface::class => Router\FastRouteRouterFactory::class,
             ErrorHandler::class => Container\ErrorHandlerFactory::class,
+            Middleware\ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
         ],
     ],
 
diff --git a/module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php b/module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php
new file mode 100644
index 00000000..1551d8cd
--- /dev/null
+++ b/module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php
@@ -0,0 +1,30 @@
+<?php
+namespace Shlinkio\Shlink\Common\Factory;
+
+use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use Zend\Diactoros\Response\EmptyResponse;
+use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+class EmptyResponseImplicitOptionsMiddlewareFactory implements FactoryInterface
+{
+    /**
+     * Create an object
+     *
+     * @param  ContainerInterface $container
+     * @param  string $requestedName
+     * @param  null|array $options
+     * @return object
+     * @throws ServiceNotFoundException if unable to resolve the service.
+     * @throws ServiceNotCreatedException if an exception is raised when
+     *     creating a service.
+     * @throws ContainerException if any other error occurs
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        return new ImplicitOptionsMiddleware(new EmptyResponse());
+    }
+}
diff --git a/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php b/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
new file mode 100644
index 00000000..dd4b6301
--- /dev/null
+++ b/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\Common\Factory;
+
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory;
+use Zend\Diactoros\Response\EmptyResponse;
+use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
+use Zend\ServiceManager\ServiceManager;
+
+class EmptyResponseImplicitOptionsMiddlewareFactoryTest extends TestCase
+{
+    /**
+     * @var EmptyResponseImplicitOptionsMiddlewareFactory
+     */
+    protected $factory;
+
+    public function setUp()
+    {
+        $this->factory = new EmptyResponseImplicitOptionsMiddlewareFactory();
+    }
+
+    /**
+     * @test
+     */
+    public function serviceIsCreated()
+    {
+        $instance = $this->factory->__invoke(new ServiceManager(), '');
+        $this->assertInstanceOf(ImplicitOptionsMiddleware::class, $instance);
+    }
+
+    /**
+     * @test
+     */
+    public function responsePrototypeIsEmptyResponse()
+    {
+        $instance = $this->factory->__invoke(new ServiceManager(), '');
+
+        $ref = new \ReflectionObject($instance);
+        $prop = $ref->getProperty('response');
+        $prop->setAccessible(true);
+        $this->assertInstanceOf(EmptyResponse::class, $prop->getValue($instance));
+    }
+}