diff --git a/net.cpp b/net.cpp
index 833aafc0a..f3857baf6 100644
--- a/net.cpp
+++ b/net.cpp
@@ -939,7 +939,7 @@ void ThreadMapPort2(void* parg)
         freeUPNPDevlist(devlist); devlist = 0;
         FreeUPNPUrls(&urls);
         loop {
-            if (fShutdown)
+            if (fShutdown || !fUseUPnP)
                 return;
             Sleep(2000);
         }