diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index 27e86a35..e15788d2 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -7,6 +7,7 @@ use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Shlinkio\Shlink\Core\Service;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
+use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Zend\ServiceManager\Factory\InvokableFactory;
 
@@ -32,6 +33,7 @@ return [
             Action\Tag\CreateTagsAction::class => ConfigAbstractFactory::class,
             Action\Tag\UpdateTagAction::class => ConfigAbstractFactory::class,
 
+            ImplicitOptionsMiddleware::class => Middleware\EmptyResponseImplicitOptionsMiddlewareFactory::class,
             Middleware\BodyParserMiddleware::class => InvokableFactory::class,
             Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
             Middleware\PathVersionMiddleware::class => InvokableFactory::class,
diff --git a/module/Rest/src/Middleware/ShortUrl/ShortCodePathMiddleware.php b/module/Rest/src/Middleware/ShortUrl/ShortCodePathMiddleware.php
index 80045097..e79bcd7d 100644
--- a/module/Rest/src/Middleware/ShortUrl/ShortCodePathMiddleware.php
+++ b/module/Rest/src/Middleware/ShortUrl/ShortCodePathMiddleware.php
@@ -10,9 +10,10 @@ use Psr\Http\Server\RequestHandlerInterface;
 
 use function str_replace;
 
+/** @deprecated */
 class ShortCodePathMiddleware implements MiddlewareInterface
 {
-    private const OLD_PATH_PREFIX = '/short-codes';
+    private const OLD_PATH_PREFIX = '/short-codes'; // Old path is deprecated. Remove this middleware on v2
     private const NEW_PATH_PREFIX = '/short-urls';
 
     /**