diff --git a/source/network/NetServer.cpp b/source/network/NetServer.cpp
index bcdccdab8d..c211c7b1bc 100644
--- a/source/network/NetServer.cpp
+++ b/source/network/NetServer.cpp
@@ -159,6 +159,11 @@ CNetServerWorker::~CNetServerWorker()
 		m_WorkerThread.join();
 	}
 
+#if CONFIG2_MINIUPNPC
+	if (m_UPnPThread.joinable())
+		m_UPnPThread.detach();
+#endif
+
 	// Clean up resources
 
 	delete m_Stats;