diff --git a/libretroshare/src/upnp/UPnPBase.cpp b/libretroshare/src/upnp/UPnPBase.cpp
index 484fe0f8f..34cef5994 100644
--- a/libretroshare/src/upnp/UPnPBase.cpp
+++ b/libretroshare/src/upnp/UPnPBase.cpp
@@ -912,8 +912,9 @@ m_UPnPClientHandle(),
 m_RootDeviceMap(),
 m_ServiceMap(),
 m_ActivePortMappingsMap(),
-m_RootDeviceListMutex(),
+m_RootDeviceListMutex("UPnPControlPoint-RootDeviceList"),
 m_IGWDeviceDetected(false),
+m_WaitForSearchTimeoutMutex("UPnPControlPoint-WaitForSearchTimeout"),
 m_WanService(NULL)
 {
 #ifdef UPNP_DEBUG
diff --git a/libretroshare/src/upnp/upnphandler.cc b/libretroshare/src/upnp/upnphandler.cc
index 4465bb785..cd2b7316e 100644
--- a/libretroshare/src/upnp/upnphandler.cc
+++ b/libretroshare/src/upnp/upnphandler.cc
@@ -257,7 +257,7 @@ bool upnphandler::shutdown_upnp()
 
 upnphandler::upnphandler()
 	:
-	upnpState(RS_UPNP_S_UNINITIALISED),
+	upnpState(RS_UPNP_S_UNINITIALISED), dataMtx("upupState"),
 	 cUPnPControlPoint(NULL),
 	   toEnable(false), toStart(false), toStop(false),
 	iport(0),eport(0), eport_curr(0)