diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
index c6e1f26..8f84fef 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
@@ -47,8 +47,9 @@
 @code {
 	List<IPAddress> ipAddresses = new List<IPAddress>();
 
-	protected override async Task OnInitializedAsync()
+	protected override void OnInitialized()
 	{
+		ipAddresses.AddRange(MdnsDiscovery.GetChachedDevices());
 		MdnsDiscovery.OnDeviceFound += address =>
 		{
 			ipAddresses.Add(address);
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/DeviceManagmentService.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/DeviceManagmentService.cs
index 11937e6..5bbf350 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/DeviceManagmentService.cs
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/DeviceManagmentService.cs
@@ -10,138 +10,149 @@ namespace Elektrifikatsiya.Services.Implementations;
 
 public class DeviceManagmentService : IDeviceManagmentService
 {
-    private readonly DeviceManagmentDatabaseContext deviceManagmentDatabaseContext;
-    private readonly IServiceScopeFactory serviceScopeFactory;
-    private readonly IDeviceStatusService deviceStatusService;
-    private readonly HttpClient httpClient;
+	private readonly DeviceManagmentDatabaseContext deviceManagmentDatabaseContext;
+	private readonly IServiceScopeFactory serviceScopeFactory;
+	private readonly IDeviceStatusService deviceStatusService;
+	private readonly ILogger<DeviceManagmentService> logger;
+	private readonly HttpClient httpClient;
 
-    public DeviceManagmentService(IServiceScopeFactory serviceScopeFactory, IDeviceStatusService deviceStatusService, HttpClient httpClient)
-    {
-	    this.serviceScopeFactory = serviceScopeFactory;
-	    this.deviceStatusService = deviceStatusService;
-        this.httpClient = httpClient;
+	public DeviceManagmentService(IServiceScopeFactory serviceScopeFactory, IDeviceStatusService deviceStatusService, ILogger<DeviceManagmentService> logger, HttpClient httpClient)
+	{
+		this.serviceScopeFactory = serviceScopeFactory;
+		this.deviceStatusService = deviceStatusService;
+		this.logger = logger;
+		this.httpClient = httpClient;
 
-           }
+	}
 
-    public Result<Device> GetDevice(string macAdress)
-    {
-	    Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
+	public Result<Device> GetDevice(string macAdress)
+	{
+		Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
 
-        if (getDevicesResult.IsFailed)
-        {
-            return getDevicesResult.ToResult();
-        }
+		if (getDevicesResult.IsFailed)
+		{
+			return getDevicesResult.ToResult();
+		}
 
-        Device? device = getDevicesResult.Value.FirstOrDefault(d => d.MacAddress == macAdress);
+		Device? device = getDevicesResult.Value.FirstOrDefault(d => d.MacAddress == macAdress);
 
-        if (device is null)
-        {
-            return Result.Fail("Device does not exist!");
-        }
+		if (device is null)
+		{
+			return Result.Fail("Device does not exist!");
+		}
 
-        return device;
-    }
+		return device;
+	}
 
-    public Result<List<Device>> GetDevices()
-    {
-        Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
+	public Result<List<Device>> GetDevices()
+	{
+		Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
 
-        if (getDevicesResult.IsFailed)
-        {
-            return getDevicesResult.ToResult();
-        }
+		if (getDevicesResult.IsFailed)
+		{
+			return getDevicesResult.ToResult();
+		}
 
-        return getDevicesResult.Value.ToList();
-    }
+		return getDevicesResult.Value.ToList();
+	}
 
-    public Result<List<Device>> GetDevicesInRoom(string room)
-    {
-        Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
+	public Result<List<Device>> GetDevicesInRoom(string room)
+	{
+		Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
 
-        if (getDevicesResult.IsFailed)
-        {
-            return getDevicesResult.ToResult();
-        }
+		if (getDevicesResult.IsFailed)
+		{
+			return getDevicesResult.ToResult();
+		}
 
-        return getDevicesResult.Value.Where(d => d.Room == room).ToList();
-    }
+		return getDevicesResult.Value.Where(d => d.Room == room).ToList();
+	}
 
-    public Result<List<Device>> GetDevicesOfUser(int userId)
-    {
-        Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
+	public Result<List<Device>> GetDevicesOfUser(int userId)
+	{
+		Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
 
-        if (getDevicesResult.IsFailed)
-        {
-            return getDevicesResult.ToResult();
-        }
+		if (getDevicesResult.IsFailed)
+		{
+			return getDevicesResult.ToResult();
+		}
 
-        return getDevicesResult.Value.Where(d => d.User.Id == userId).ToList();
-    }
+		return getDevicesResult.Value.Where(d => d.User.Id == userId).ToList();
+	}
 
-    public async Task<Result<Device>> RegisterDevice(IPAddress ip, User user, string? name = null, string room = "default")
-    {
-	    using IServiceScope scope = serviceScopeFactory.CreateScope();
-	    DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+	public async Task<Result<Device>> RegisterDevice(IPAddress ip, User user, string? name = null, string room = "default")
+	{
+		using IServiceScope scope = serviceScopeFactory.CreateScope();
+		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
 
-		ShellyResponse? shellyResponse = await httpClient.GetFromJsonAsync<ShellyResponse>($"http://{ip}/shelly");
+		ShellyResponse? shellyResponse = null;
 
-        if (shellyResponse is null || shellyResponse.Type != "SHPLG-S")
-        {
-            return Result.Fail("Device is not reachable or not a \"SHPLG-S\"!");
-        }
+		try
+		{
+			shellyResponse = await httpClient.GetFromJsonAsync<ShellyResponse>($"http://{ip}/shelly");
+		}
+		catch (Exception ex)
+		{
+			logger.LogError("HTTP request failed! {message}", ex.Message);
+		}
 
-        string mac = shellyResponse.Mac;
+		if (shellyResponse is null || shellyResponse.Type != "SHPLG-S")
+		{
+			return Result.Fail("Device is not reachable or not a \"SHPLG-S\"!");
+		}
 
-        if (!PhysicalAddress.TryParse(mac, out _))
-        {
-            return Result.Fail("Invalid mac address!");
-        }
+		string mac = shellyResponse.Mac;
 
-        Device device = new Device(mac, name ?? mac, ip, user, room);
+		if (!PhysicalAddress.TryParse(mac, out _))
+		{
+			return Result.Fail("Invalid mac address!");
+		}
 
-        deviceManagmentDatabaseContext.Add(device);
-        Result saveDatabaseChangesResult = await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+		Device device = new Device(mac, name ?? mac, ip, user, room);
 
-        Result trackDeviceResult = deviceStatusService.TrackDevice(device);
+		_ = deviceManagmentDatabaseContext.Add(device);
+		Result saveDatabaseChangesResult = await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
 
-        return Result.Merge(saveDatabaseChangesResult, trackDeviceResult).ToResult(device);
-    }
+		Result trackDeviceResult = deviceStatusService.TrackDevice(device);
 
-    public async Task<Result> UnregisterDevice(string macAdress)
-    {
-	    using IServiceScope scope = serviceScopeFactory.CreateScope();
-	    DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+		return Result.Merge(saveDatabaseChangesResult, trackDeviceResult).ToResult(device);
+	}
+
+	public async Task<Result> UnregisterDevice(string macAdress)
+	{
+		using IServiceScope scope = serviceScopeFactory.CreateScope();
+		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
 
 		Result<Device> getDeviceResult = GetDevice(macAdress);
 
-        if (getDeviceResult.IsFailed)
-        {
-            return getDeviceResult.ToResult();
-        }
+		if (getDeviceResult.IsFailed)
+		{
+			return getDeviceResult.ToResult();
+		}
 
-        Result untrackDeviceResult = deviceStatusService.UntrackDevice(macAdress);
+		Result untrackDeviceResult = deviceStatusService.UntrackDevice(macAdress);
 
-        if (untrackDeviceResult.IsFailed)
-        {
-            return untrackDeviceResult;
-        }
+		if (untrackDeviceResult.IsFailed)
+		{
+			return untrackDeviceResult;
+		}
 
-        deviceManagmentDatabaseContext.Remove(getDeviceResult.Value);
+		_ = deviceManagmentDatabaseContext.Remove(getDeviceResult.Value);
 
-        return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
-    }
+		return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+	}
 
-    public async Task<Result> UpdateDevice(Device device)
-    {
-        Result result = deviceStatusService.UpdateDeviceStatus(device);
+	public async Task<Result> UpdateDevice(Device device)
+	{
+		Result result = deviceStatusService.UpdateDeviceStatus(device);
 
-        if (result.IsFailed)
-        {
-            return result;
-        }
+		if (result.IsFailed)
+		{
+			return result;
+		}
 
-        deviceManagmentDatabaseContext.Update(device);
+		_ = deviceManagmentDatabaseContext.Update(device);
 
-        return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
-    }
+		return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+	}
 }
\ No newline at end of file
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Utilities/MdnsDiscovery.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Utilities/MdnsDiscovery.cs
index 8b9c46a..55a8943 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Utilities/MdnsDiscovery.cs
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Utilities/MdnsDiscovery.cs
@@ -1,20 +1,25 @@
 using System.Net;
-using FluentResults;
+
 using Tmds.MDns;
 
 namespace Elektrifikatsiya.Utilities;
 
 public static class MdnsDiscovery
 {
-	public static event Action<IPAddress> OnDeviceFound;
+    public static event Action<IPAddress> OnDeviceFound = null!;
 
-	static ServiceBrowser serviceBrowser = new ServiceBrowser();
+    private static readonly ServiceBrowser serviceBrowser = new ServiceBrowser();
 
-	static MdnsDiscovery()
-	{
-		serviceBrowser.StartBrowse("_http._tcp");
+    static MdnsDiscovery()
+    {
+        serviceBrowser.StartBrowse("_http._tcp");
         serviceBrowser.ServiceAdded += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
         serviceBrowser.ServiceChanged += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
         serviceBrowser.ServiceRemoved += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
     }
+
+    public static IEnumerable<IPAddress> GetChachedDevices()
+    {
+        return serviceBrowser.Services.Select(s => s.Addresses.First());
+    }
 }
\ No newline at end of file