diff --git a/composer.json b/composer.json
index f7835b3f..ada2facc 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
         "ramsey/uuid": "^3.9",
         "shlinkio/shlink-common": "dev-main#1311861 as 3.4",
         "shlinkio/shlink-config": "^1.0",
-        "shlinkio/shlink-event-dispatcher": "^1.6",
+        "shlinkio/shlink-event-dispatcher": "^2.0",
         "shlinkio/shlink-importer": "^2.1",
         "shlinkio/shlink-installer": "^5.3",
         "shlinkio/shlink-ip-geolocation": "^1.5",
diff --git a/module/Core/src/EventDispatcher/ShortUrlVisited.php b/module/Core/src/EventDispatcher/Event/ShortUrlVisited.php
similarity index 95%
rename from module/Core/src/EventDispatcher/ShortUrlVisited.php
rename to module/Core/src/EventDispatcher/Event/ShortUrlVisited.php
index c33f805a..2cac3dbc 100644
--- a/module/Core/src/EventDispatcher/ShortUrlVisited.php
+++ b/module/Core/src/EventDispatcher/Event/ShortUrlVisited.php
@@ -29,6 +29,6 @@ final class ShortUrlVisited implements JsonSerializable
 
     public function jsonSerialize(): array
     {
-        return ['visitId' => $this->visitId, 'originalIpAddress' => $this->originalIpAddress];
+        return ['visitId' => $this->visitId, 'originalIpAddress' => '<censored>'];
     }
 }
diff --git a/module/Core/src/EventDispatcher/VisitLocated.php b/module/Core/src/EventDispatcher/Event/VisitLocated.php
similarity index 100%
rename from module/Core/src/EventDispatcher/VisitLocated.php
rename to module/Core/src/EventDispatcher/Event/VisitLocated.php