diff --git a/lib/agent/drivers/push/index.js b/lib/agent/drivers/push/index.js
index <HASH>..<HASH> 100644
--- a/lib/agent/drivers/push/index.js
+++ b/lib/agent/drivers/push/index.js
@@ -171,6 +171,13 @@ var check_mapping = function(cb) {
     if (mapping) {
 
       logger.info('Found existing mapping! Using port ' + mapping.NewExternalPort);
+
+      mapper.found_upnp_mapping({
+        external: mapping.NewExternalPort,
+        internal: port,
+        name: service_desc
+      });
+
       mapped(mapping.NewExternalPort, cb);
 
     } else { // not mapped or mapped to someone else
diff --git a/lib/agent/drivers/push/mapper.js b/lib/agent/drivers/push/mapper.js
index <HASH>..<HASH> 100644
--- a/lib/agent/drivers/push/mapper.js
+++ b/lib/agent/drivers/push/mapper.js
@@ -163,3 +163,8 @@ exports.map = function(opts, cb) {
 exports.unmap = function(cb) {
   do_unmap(cb);
 }
+
+exports.found_upnp_mapping = function(opts) {
+  mapper = upnp;
+  mapped_opts = opts;
+}
Mapper: Make sure we marked as mapped if check was successful.