diff --git a/src/EventListener/IpTraceListener.php b/src/EventListener/IpTraceListener.php
deleted file mode 100644
index 857c1b41..00000000
--- a/src/EventListener/IpTraceListener.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Stof\DoctrineExtensionsBundle\EventListener;
-
-use Gedmo\IpTraceable\IpTraceableListener;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * @internal
- */
-final class IpTraceListener implements EventSubscriberInterface
-{
-    private IpTraceableListener $ipTraceableListener;
-
-    public function __construct(IpTraceableListener $ipTraceableListener)
-    {
-        $this->ipTraceableListener = $ipTraceableListener;
-    }
-
-    public function onKernelRequest(RequestEvent $event): void
-    {
-        if (!$event->isMainRequest()) {
-            return;
-        }
-
-        $ip = $event->getRequest()->getClientIp();
-
-        if (null !== $ip) {
-            $this->ipTraceableListener->setIpValue($ip);
-        }
-    }
-
-    public static function getSubscribedEvents(): array
-    {
-        return array(
-            KernelEvents::REQUEST => ['onKernelRequest', 500],
-        );
-    }
-}
diff --git a/src/Resources/config/ip_traceable.xml b/src/Resources/config/ip_traceable.xml
index d480f036..9f024106 100644
--- a/src/Resources/config/ip_traceable.xml
+++ b/src/Resources/config/ip_traceable.xml
@@ -12,11 +12,9 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
-        </service>
-
-        <service id="stof_doctrine_extensions.event_listener.ip_trace" class="Stof\DoctrineExtensionsBundle\EventListener\IpTraceListener" public="false">
-            <argument type="service" id="stof_doctrine_extensions.listener.ip_traceable" />
-            <tag name="kernel.event_subscriber" />
+            <call method="setIpAddressProvider">
+                <argument type="service" id="stof_doctrine_extensions.tool.ip_address_provider" />
+            </call>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/tool.xml b/src/Resources/config/tool.xml
index 1c9d43ca..7442c926 100644
--- a/src/Resources/config/tool.xml
+++ b/src/Resources/config/tool.xml
@@ -9,5 +9,9 @@
             <argument type="service" id="security.token_storage" on-invalid="null" />
             <argument type="service" id="security.authorization_checker" on-invalid="null" />
         </service>
+
+        <service id="stof_doctrine_extensions.tool.ip_address_provider" class="Stof\DoctrineExtensionsBundle\Tool\RequestStackIpAddressProvider" public="false">
+            <argument type="service" id="request_stack" on-invalid="null" />
+        </service>
     </services>
 </container>
diff --git a/src/Tool/RequestStackIpAddressProvider.php b/src/Tool/RequestStackIpAddressProvider.php
new file mode 100644
index 00000000..df1a210a
--- /dev/null
+++ b/src/Tool/RequestStackIpAddressProvider.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Stof\DoctrineExtensionsBundle\Tool;
+
+use Gedmo\Tool\IpAddressProviderInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Provides an IP address for the extensions using an IP address reference.
+ *
+ * @internal
+ */
+final class RequestStackIpAddressProvider implements IpAddressProviderInterface
+{
+    private ?RequestStack $requestStack;
+
+    public function __construct(?RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+
+    public function getAddress(): ?string
+    {
+        if (null === $this->requestStack) {
+            return null;
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+
+        if (null === $request) {
+            return null;
+        }
+
+        return $request->getClientIp();
+    }
+}