diff --git a/src/lib/upnp/Discovery.cxx b/src/lib/upnp/Discovery.cxx
index 139eb6f36..3821e6d0d 100644
--- a/src/lib/upnp/Discovery.cxx
+++ b/src/lib/upnp/Discovery.cxx
@@ -230,8 +230,7 @@ UPnPDeviceDirectory::UPnPDeviceDirectory(UpnpClient_Handle _handle,
 					 UPnPDiscoveryListener *_listener)
 	:handle(_handle),
 	 listener(_listener),
-	 queue("DiscoveredQueue"),
-	 search_timeout(2), last_search(0)
+	 queue("DiscoveredQueue")
 {
 }
 
diff --git a/src/lib/upnp/Discovery.hxx b/src/lib/upnp/Discovery.hxx
index 6069afec6..eb3b308be 100644
--- a/src/lib/upnp/Discovery.hxx
+++ b/src/lib/upnp/Discovery.hxx
@@ -103,12 +103,12 @@ class UPnPDeviceDirectory final : UpnpCallback {
 	 * called delay because it's the base of a random delay that
 	 * the devices apply to avoid responding all at the same time.
 	 */
-	int search_timeout;
+	int search_timeout = 2;
 
 	/**
 	 * The MonotonicClockS() time stamp of the last search.
 	 */
-	unsigned last_search;
+	unsigned last_search = 0;
 
 public:
 	UPnPDeviceDirectory(UpnpClient_Handle _handle,