diff --git a/android/app/src/main/java/com/metallic/chiaki/discovery/DiscoveryManager.kt b/android/app/src/main/java/com/metallic/chiaki/discovery/DiscoveryManager.kt
index a5edfca..fceb1ad 100644
--- a/android/app/src/main/java/com/metallic/chiaki/discovery/DiscoveryManager.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/discovery/DiscoveryManager.kt
@@ -121,6 +121,7 @@ class DiscoveryManager
 	{
 		if(active && !paused && discoveryService == null)
 		{
+			discoveredHostsSubjectRaw.onNext(listOf())
 			try
 			{
 				discoveryService = DiscoveryService(DiscoveryServiceOptions(
@@ -137,7 +138,8 @@ class DiscoveryManager
 			val service = discoveryService ?: return
 			service.dispose()
 			discoveryService = null
-			discoveredHostsSubjectRaw.onNext(listOf())
+			if(!active)
+				discoveredHostsSubjectRaw.onNext(listOf())
 		}
 	}
 }
\ No newline at end of file