diff --git a/src/upnp/upnp_context.cpp b/src/upnp/upnp_context.cpp
index 42de87f..e832c65 100644
--- a/src/upnp/upnp_context.cpp
+++ b/src/upnp/upnp_context.cpp
@@ -378,7 +378,6 @@
     return mapRes;
 }
 
-// TODO: double-check what the expected behavior is when the mapping has auto-update enabled.
 void
 UPnPContext::releaseMapping(const Mapping& map)
 {
@@ -400,7 +399,7 @@
 
         // Remove it.
         requestRemoveMapping(mapPtr);
-        unregisterMapping(mapPtr);
+        unregisterMapping(mapPtr, true);
         enforceAvailableMappingsLimits();
     });
 }