diff --git a/Exo.Service.Core/PowerService.cs b/Exo.Service.Core/PowerService.cs
index c81c8540..0ae29daa 100644
--- a/Exo.Service.Core/PowerService.cs
+++ b/Exo.Service.Core/PowerService.cs
@@ -377,6 +377,7 @@ private async ValueTask HandleArrivalAsync(DeviceWatchNotification notification,
 		if (!_deviceStates.TryGetValue(notification.DeviceInformation.Id, out var deviceState))
 		{
 			deviceState = new(this, _devicesConfigurationContainer.GetContainer(notification.DeviceInformation.Id), notification.DeviceInformation.Id, default);
+			_deviceStates.TryAdd(notification.DeviceInformation.Id, deviceState);
 			shouldPersistInformation = true;
 		}