diff --git a/app/Discovery/Sensor.php b/app/Discovery/Sensor.php
index b2fbc3a9e4..32c301eb73 100644
--- a/app/Discovery/Sensor.php
+++ b/app/Discovery/Sensor.php
@@ -47,6 +47,7 @@ class Sensor
 
     public function discover(\App\Models\Sensor $sensor): static
     {
+        $sensor->device_id ??= \DeviceCache::getPrimary()->device_id;
         $this->models->push($sensor);
         $this->discovered[$sensor->syncGroup()] = false;