diff --git a/js/app.js b/js/app.js
index 6466fe3f..57035541 100644
--- a/js/app.js
+++ b/js/app.js
@@ -21,6 +21,11 @@ if (process.env.MM_CONFIG_FILE) {
 	global.configuration_file = process.env.MM_CONFIG_FILE;
 }
 
+//Hotfix PullRequest #673
+if (process.env.MM_PORT) {
+	global.mmPort = process.env.MM_PORT;
+}
+
 // The next part is here to prevent a major exception when there
 // is no internet connection. This could probable be solved better.
 process.on("uncaughtException", function (err) {
diff --git a/js/defaults.js b/js/defaults.js
index e7e96036..66926de7 100644
--- a/js/defaults.js
+++ b/js/defaults.js
@@ -7,8 +7,12 @@
  * MIT Licensed.
  */
 
+var port = 8080;
+if (typeof(mmPort) !== "undefined") {
+	port = mmPort;
+}
 var defaults = {
-	port: process.env.MM_PORT || 8080,
+	port: port,
 	kioskmode: false,
 	electronOptions: {},
 	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],