diff --git a/ChangeLog b/ChangeLog
index 00f241388..ec0f8cf29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@ release 0.14.3
 	* fixed filename bug when using wide characters
 	* fixed rare crash in peer banning code
 	* fixed potential HTTP compatibility issue
+	* fixed UPnP crash
 
 release 0.14.2
 
diff --git a/src/upnp.cpp b/src/upnp.cpp
index 819c35182..c180cb8cb 100644
--- a/src/upnp.cpp
+++ b/src/upnp.cpp
@@ -938,7 +938,10 @@ void upnp::disable(char const* msg)
 		m_callback(i - m_mappings.begin(), 0, msg);
 	}
 	
-	m_devices.clear();
+	// we cannot clear the devices since there
+	// might be outstanding requests relying on
+	// the device entry being present when they
+	// complete
 	error_code ec;
 	m_broadcast_timer.cancel(ec);
 	m_refresh_timer.cancel(ec);