diff --git a/composer.json b/composer.json
index 1bb4ac25..c1fd4d5c 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,7 @@
         "ext-json": "*",
         "ext-pdo": "*",
         "acelaya/ze-content-based-error-handler": "^2.2",
+        "akrabat/ip-address-middleware": "^1.0",
         "cakephp/chronos": "^1.2",
         "cocur/slugify": "^3.0",
         "doctrine/cache": "^1.6",
diff --git a/module/Common/config/dependencies.config.php b/module/Common/config/dependencies.config.php
index e9422d38..6278d63b 100644
--- a/module/Common/config/dependencies.config.php
+++ b/module/Common/config/dependencies.config.php
@@ -1,16 +1,14 @@
 <?php
 declare(strict_types=1);
 
+namespace Shlinkio\Shlink\Common;
+
 use Doctrine\Common\Cache\Cache;
 use Doctrine\ORM\EntityManager;
+use GuzzleHttp\Client as GuzzleClient;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
-use Shlinkio\Shlink\Common\Factory;
-use Shlinkio\Shlink\Common\Image;
-use Shlinkio\Shlink\Common\Image\ImageBuilder;
-use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
-use Shlinkio\Shlink\Common\Service;
-use Shlinkio\Shlink\Common\Template\Extension\TranslatorExtension;
+use RKA\Middleware\IpAddress;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\I18n\Translator\Translator;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
@@ -21,14 +19,16 @@ return [
     'dependencies' => [
         'factories' => [
             EntityManager::class => Factory\EntityManagerFactory::class,
-            GuzzleHttp\Client::class => InvokableFactory::class,
+            GuzzleClient::class => InvokableFactory::class,
             Cache::class => Factory\CacheFactory::class,
             'Logger_Shlink' => Factory\LoggerFactory::class,
             Filesystem::class => InvokableFactory::class,
 
             Translator::class => Factory\TranslatorFactory::class,
-            TranslatorExtension::class => ConfigAbstractFactory::class,
-            LocaleMiddleware::class => ConfigAbstractFactory::class,
+            Template\Extension\TranslatorExtension::class => ConfigAbstractFactory::class,
+
+            Middleware\LocaleMiddleware::class => ConfigAbstractFactory::class,
+            IpAddress::class => Middleware\IpAddressMiddlewareFactory::class,
 
             Image\ImageBuilder::class => Image\ImageBuilderFactory::class,
 
@@ -37,7 +37,7 @@ return [
         ],
         'aliases' => [
             'em' => EntityManager::class,
-            'httpClient' => GuzzleHttp\Client::class,
+            'httpClient' => GuzzleClient::class,
             'translator' => Translator::class,
             'logger' => LoggerInterface::class,
             Logger::class => 'Logger_Shlink',
@@ -49,11 +49,11 @@ return [
     ],
 
     ConfigAbstractFactory::class => [
-        TranslatorExtension::class => ['translator'],
-        LocaleMiddleware::class => ['translator'],
+        Template\Extension\TranslatorExtension::class => ['translator'],
+        Middleware\LocaleMiddleware::class => ['translator'],
         Service\IpApiLocationResolver::class => ['httpClient'],
         Service\PreviewGenerator::class => [
-            ImageBuilder::class,
+            Image\ImageBuilder::class,
             Filesystem::class,
             'config.preview_generation.files_location',
         ],
diff --git a/module/Common/src/Middleware/IpAddressMiddlewareFactory.php b/module/Common/src/Middleware/IpAddressMiddlewareFactory.php
new file mode 100644
index 00000000..5d988a2e
--- /dev/null
+++ b/module/Common/src/Middleware/IpAddressMiddlewareFactory.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Common\Middleware;
+
+use Interop\Container\ContainerInterface;
+use RKA\Middleware\IpAddress;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+class IpAddressMiddlewareFactory implements FactoryInterface
+{
+    /**
+     * Create an object
+     *
+     * @param  ContainerInterface $container
+     * @param  string $requestedName
+     * @param  null|array $options
+     * @throws ServiceNotFoundException if unable to resolve the service.
+     * @throws ServiceNotCreatedException if an exception is raised when creating a service.
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null): IpAddress
+    {
+        return new IpAddress(true, []);
+    }
+}
diff --git a/module/Common/test/Middleware/IpAddressMiddlewareFactoryTest.php b/module/Common/test/Middleware/IpAddressMiddlewareFactoryTest.php
new file mode 100644
index 00000000..ab6dc95c
--- /dev/null
+++ b/module/Common/test/Middleware/IpAddressMiddlewareFactoryTest.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\Common\Middleware;
+
+use PHPUnit\Framework\TestCase;
+use ReflectionObject;
+use Shlinkio\Shlink\Common\Middleware\IpAddressMiddlewareFactory;
+use Zend\ServiceManager\ServiceManager;
+
+class IpAddressMiddlewareFactoryTest extends TestCase
+{
+    private $factory;
+
+    public function setUp()
+    {
+        $this->factory = new IpAddressMiddlewareFactory();
+    }
+
+    /**
+     * @test
+     */
+    public function returnedInstanceIsProperlyConfigured()
+    {
+        $instance = $this->factory->__invoke(new ServiceManager(), '');
+
+        $ref = new ReflectionObject($instance);
+        $checkProxyHeaders = $ref->getProperty('checkProxyHeaders');
+        $checkProxyHeaders->setAccessible(true);
+        $trustedProxies = $ref->getProperty('trustedProxies');
+        $trustedProxies->setAccessible(true);
+
+        $this->assertTrue($checkProxyHeaders->getValue($instance));
+        $this->assertEquals([], $trustedProxies->getValue($instance));
+    }
+}