diff --git a/nano/node/portmapping.cpp b/nano/node/portmapping.cpp
index cd7907e2c..a4d3ddac6 100644
--- a/nano/node/portmapping.cpp
+++ b/nano/node/portmapping.cpp
@@ -205,8 +205,8 @@ nano::upnp_state::~upnp_state ()
 	if (devices)
 	{
 		freeUPNPDevlist (devices);
-		devices = nullptr;
 	}
+	FreeUPNPUrls (&urls);
 }
 
 nano::upnp_state & nano::upnp_state::operator= (nano::upnp_state && other_a)
@@ -221,6 +221,7 @@ nano::upnp_state & nano::upnp_state::operator= (nano::upnp_state && other_a)
 	}
 	devices = other_a.devices;
 	other_a.devices = nullptr;
+	FreeUPNPUrls (&urls);
 	urls = other_a.urls;
 	other_a.urls = { 0 };
 	data = other_a.data;