diff --git a/apiServer.js b/apiServer.js
index def3a658c..880faa780 100644
--- a/apiServer.js
+++ b/apiServer.js
@@ -24,6 +24,9 @@ let initialHash = hash(fs.readFileSync(path.join(__dirname, '/config/userconfig.
 
 async function loadUpnpIfRequired() {
   // direct node (non UPnP)
+  if (userconfig.initial.apiport) {
+    await upnpService.setupUPNP(apiPort);
+  }
   if (userconfig.initial.apiport === config.server.apiport && !userconfig.initial.routerIP) {
     return;
   }
diff --git a/homeServer.js b/homeServer.js
index a1a40e875..c595d5d60 100644
--- a/homeServer.js
+++ b/homeServer.js
@@ -32,6 +32,9 @@ async function initiate() {
     log.error(`Flux port ${apiPort} is not supported. Shutting down.`);
     process.exit();
   }
+  if (userconfig.initial.apiport) {
+    await upnpService.setupUPNP(apiPort);
+  }
   if (userconfig.initial.apiport && userconfig.initial.apiport !== config.server.apiport) {
     const verifyUpnp = await upnpService.verifyUPNPsupport(apiPort);
     if (verifyUpnp !== true) {