diff --git a/source/network/NetServer.cpp b/source/network/NetServer.cpp
index 52c630e609..bb9e439ff4 100644
--- a/source/network/NetServer.cpp
+++ b/source/network/NetServer.cpp
@@ -244,6 +244,10 @@ bool CNetServerWorker::SetupConnection()
 	if(intClient[0])
 		LOGMESSAGE(L"Net server: External %s:%s %s is redirected to internal %s:%s (duration=%s)\n",
 		       externalIPAddress, externalPort, protocall, intClient, intPort, duration);
+
+	// Make sure everything is properly freed.
+	FreeUPNPUrls(&urls);
+	freeUPNPDevlist(devlist);
 	// End UPnP setup.
 
 	return true;