diff --git a/src/lib/upnp/Discovery.cxx b/src/lib/upnp/Discovery.cxx
index 6d150111c..1eafaa7c3 100644
--- a/src/lib/upnp/Discovery.cxx
+++ b/src/lib/upnp/Discovery.cxx
@@ -233,16 +233,7 @@ UPnPDeviceDirectory::OnAlive(const UpnpDiscovery *disco) noexcept
 	    isCDService(UpnpDiscovery_get_ServiceType_cstr(disco))) {
 		try {
 			auto *downloader = new Downloader(*this, *disco);
-
-			try {
-				downloader->Start();
-			} catch (...) {
-				BlockingCall(GetEventLoop(), [downloader](){
-						downloader->Destroy();
-					});
-
-				throw;
-			}
+			downloader->Start();
 		} catch (...) {
 			LogError(std::current_exception());
 			return UPNP_E_SUCCESS;