diff --git a/HyperbolicDownloaderApi/Commands/HostCommands.cs b/HyperbolicDownloaderApi/Commands/HostCommands.cs
index 1bf31cd..1ed4ac6 100644
--- a/HyperbolicDownloaderApi/Commands/HostCommands.cs
+++ b/HyperbolicDownloaderApi/Commands/HostCommands.cs
@@ -19,8 +19,13 @@ public class HostCommands
     public void Discover(string _)
     {
         ApiManager.SendNotificationMessageNewLine("Running local discovery routine...", NotificationMessageType.Info);
+
+        int hostsCountBefore = hostsManager.Count;
+
         BroadcastClient.Send(ApiConfiguration.BroadcastPort, ApiConfiguration.PrivatePort.ToString());
         Thread.Sleep(3000);
+
+        ApiManager.SendNotificationMessageNewLine($"Found {hostsManager.Count - hostsCountBefore} host(s)", NotificationMessageType.Info);
     }
 
     public void CheckActiveHosts(string _)
diff --git a/HyperbolicDownloaderApi/Managment/ApiManager.cs b/HyperbolicDownloaderApi/Managment/ApiManager.cs
index b79aa73..94e697e 100644
--- a/HyperbolicDownloaderApi/Managment/ApiManager.cs
+++ b/HyperbolicDownloaderApi/Managment/ApiManager.cs
@@ -149,7 +149,7 @@ public class ApiManager
             return;
         }
 
-        _ = hostsToSend.RemoveAll(x => x.IPAddress == recivedEventArgs.IPEndPoint.Address.ToString());
+        _ = hostsToSend.RemoveAll(x => x.IPAddress == remoteIpAddress.ToString());
         hostsToSend.Add(localSocket);
 
         bool success = int.TryParse(recivedEventArgs.Message, out int remotePort);