diff --git a/ChangeLog b/ChangeLog
index 3523cc5fe..349e2eee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,7 @@ release 0.14.8
 	  sometimes be used incorrectly
 	* force_recheck() no longer crashes on torrents with no metadata
 	* fixed broadcast socket regression from 0.14.7
+	* fixed hang in NATPMP when shut down while waiting for a response
 
 release 0.14.7
 
diff --git a/src/natpmp.cpp b/src/natpmp.cpp
index eefbca768..ff7d930bf 100644
--- a/src/natpmp.cpp
+++ b/src/natpmp.cpp
@@ -586,6 +586,7 @@ void natpmp::close_impl(mutex::scoped_lock& l)
 	}
 	error_code ec;
 	m_refresh_timer.cancel(ec);
+	m_currently_mapping = -1;
 	update_mapping(0, l);
 }