diff --git a/app/Listeners/DataIntegrationSubscriber.php b/app/Listeners/DataIntegrationSubscriber.php
new file mode 100644
index 000000000..4c1bbc668
--- /dev/null
+++ b/app/Listeners/DataIntegrationSubscriber.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\SpeedtestCompleted;
+use App\Events\SpeedtestFailed;
+use App\Jobs\Influxdb\v2\WriteResult;
+use App\Settings\DataIntegrationSettings;
+use Illuminate\Events\Dispatcher;
+
+class DataIntegrationSubscriber
+{
+    /**
+     * Create the event listener.
+     */
+    public function __construct(
+        public DataIntegrationSettings $settings,
+    ) {}
+
+    /**
+     * Handle the event.
+     */
+    public function handle(object $event): void
+    {
+        if ($this->settings->influxdb_v2_enabled) {
+            WriteResult::dispatch($event->result);
+        }
+    }
+
+    /**
+     * Register the listeners for the subscriber.
+     *
+     * @return array<string, string>
+     */
+    public function subscribe(Dispatcher $events): array
+    {
+        return [
+            SpeedtestCompleted::class => 'handleSpeedtestCompleted',
+            SpeedtestFailed::class => 'handleSpeedtestFailed',
+        ];
+    }
+}
diff --git a/app/Listeners/SpeedtestEventSubscriber.php b/app/Listeners/SpeedtestEventSubscriber.php
deleted file mode 100644
index 7e81bc30e..000000000
--- a/app/Listeners/SpeedtestEventSubscriber.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Events\SpeedtestCompleted;
-use App\Events\SpeedtestFailed;
-use App\Jobs\Influxdb\v2\WriteResult;
-use App\Settings\DataIntegrationSettings;
-use Illuminate\Events\Dispatcher;
-
-class SpeedtestEventSubscriber
-{
-    /**
-     * Handle speedtest failed events.
-     */
-    public function handleSpeedtestFailed(SpeedtestFailed $event): void
-    {
-        $settings = app(DataIntegrationSettings::class);
-
-        if ($settings->influxdb_v2_enabled) {
-            WriteResult::dispatch($event->result);
-        }
-    }
-
-    /**
-     * Handle speedtest completed events.
-     */
-    public function handleSpeedtestCompleted(SpeedtestCompleted $event): void
-    {
-        $settings = app(DataIntegrationSettings::class);
-
-        if ($settings->influxdb_v2_enabled) {
-            WriteResult::dispatch($event->result);
-        }
-    }
-
-    /**
-     * Register the listeners for the subscriber.
-     */
-    public function subscribe(Dispatcher $events): void
-    {
-        $events->listen(
-            SpeedtestFailed::class,
-            [SpeedtestEventSubscriber::class, 'handleSpeedtestFailed']
-        );
-
-        $events->listen(
-            SpeedtestCompleted::class,
-            [SpeedtestEventSubscriber::class, 'handleSpeedtestCompleted']
-        );
-    }
-}