diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java
index 6a970ee68..a1ad8db3a 100644
--- a/router/java/src/net/i2p/router/transport/UPnPManager.java
+++ b/router/java/src/net/i2p/router/transport/UPnPManager.java
@@ -139,6 +139,8 @@ class UPnPManager {
     public synchronized void rescan() {
         if (!_shouldBeRunning)
             return;
+        if (_context.router().gracefulShutdownInProgress())
+            return;
         long now = System.currentTimeMillis();
         if (_lastRescan + RESCAN_MIN_DELAY > now)
             return;