diff --git a/custom_components/georide/binary_sensor.py b/custom_components/georide/binary_sensor.py
index 194a280..71716fd 100644
--- a/custom_components/georide/binary_sensor.py
+++ b/custom_components/georide/binary_sensor.py
@@ -34,14 +34,14 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
         entities.append(GeoRideNetworkBinarySensorEntity(coordinator, tracker_device))
         entities.append(GeoRideMovingBinarySensorEntity(coordinator, tracker_device))
 
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.tracker.tracker_id] = coordinator
     
     coordoned_beacons = georide_context.georide_trackers_beacon_coordoned
     for coordoned_beacon in coordoned_beacons:
         tracker_beacon = coordoned_tracker['tracker_beacon']
         coordinator = coordoned_tracker['coordinator']
         entities.append(GeoRideBeaconUpdatedBinarySensorEntity(coordinator, tracker_beacon))
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_beacon.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.beacon.beacon_id] = coordinator
 
 
     async_add_entities(entities, True)
diff --git a/custom_components/georide/device_tracker.py b/custom_components/georide/device_tracker.py
index 8bfb1b6..e945043 100644
--- a/custom_components/georide/device_tracker.py
+++ b/custom_components/georide/device_tracker.py
@@ -27,7 +27,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
         tracker_device = coordoned_tracker['tracker_device']
         coordinator = coordoned_tracker['coordinator']
         entity = GeoRideTrackerEntity(coordinator, tracker_device, hass)
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.tracker.tracker_id] = coordinator
         entities.append(entity)
 
     async_add_entities(entities)
diff --git a/custom_components/georide/sensor.py b/custom_components/georide/sensor.py
index c2a89b2..0be66db 100644
--- a/custom_components/georide/sensor.py
+++ b/custom_components/georide/sensor.py
@@ -28,7 +28,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
     for coordoned_tracker in coordoned_trackers:
         tracker_device = coordoned_tracker['tracker_device']
         coordinator = coordoned_tracker['coordinator']
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.tracker.tracker_id] = coordinator
         entities.append(GeoRideOdometerSensorEntity(coordinator, tracker_device, hass))
         entities.append(GeoRideOdometerKmSensorEntity(coordinator, tracker_device, hass))
         entities.append(GeoRideFixtimeSensorEntity(coordinator, tracker_device))
@@ -41,9 +41,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
         tracker_beacon = coordoned_tracker['tracker_beacon']
         coordinator = coordoned_tracker['coordinator']
         entities.append(GeoRideBeaconUpdatedBinarySensorEntity(coordinator, tracker_beacon))
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_beacon.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.beacon.beacon_id] = coordinator
 
-    await async_add_entities(entities)
+    async_add_entities(entities)
 
     return True
 
diff --git a/custom_components/georide/siren.py b/custom_components/georide/siren.py
index 2eb675f..dd72704 100644
--- a/custom_components/georide/siren.py
+++ b/custom_components/georide/siren.py
@@ -16,7 +16,8 @@ import georideapilib.api as GeoRideApi
 
 from .const import DOMAIN as GEORIDE_DOMAIN
 from .device import Device
-ENTITY_ID_FORMAT: Final = DOMAIN + ".{}"
+
+ENTITY_ID_FORMAT: Final = GEORIDE_DOMAIN + ".{}"
 
 _LOGGER = logging.getLogger(__name__) 
 
diff --git a/custom_components/georide/switch.py b/custom_components/georide/switch.py
index 01a5329..0559264 100644
--- a/custom_components/georide/switch.py
+++ b/custom_components/georide/switch.py
@@ -30,7 +30,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
     for coordoned_tracker in coordoned_trackers:
         tracker_device = coordoned_tracker['tracker_device']
         coordinator = coordoned_tracker['coordinator']
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.tracker.tracker_id] = coordinator
         entities.append(GeoRideLockSwitchEntity(coordinator, tracker_device, hass))
         if tracker_device.tracker.version > 2:
             entities.append(GeoRideEcoModeSwitchEntity(coordinator, tracker_device, hass))