diff --git a/osdep/PortMapper.cpp b/osdep/PortMapper.cpp
index a6baa9050..5c0179312 100644
--- a/osdep/PortMapper.cpp
+++ b/osdep/PortMapper.cpp
@@ -146,10 +146,12 @@ public:
 						surface.clear();
 						surface.push_back(publicAddress);
 						natPmpSuccess = true;
+						closenatpmp(&natpmp);
 						break;
+					} else {
+						closenatpmp(&natpmp);
+						// continue
 					}
-
-					closenatpmp(&natpmp);
 				}
 
 				if (!natPmpSuccess) {