diff --git a/build/electron.js b/build/electron.js
index 9c278e8..dc6fc82 100644
--- a/build/electron.js
+++ b/build/electron.js
@@ -83,6 +83,7 @@ function bootServer() {
   fs.writeFileSync(configFile, JSON.stringify(program, null, 2), 'utf8');
 
   // TODO: Select unused port
+  if (!program.port) { program.port = 3000; }
 
   const protocol = program.ssl && program.ssl.cert && program.ssl.key ? 'https' : 'http';
   trayTemplate = [
diff --git a/package.json b/package.json
index 6c59b00..5d7c488 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mstream",
-  "version": "5.2.8",
+  "version": "5.2.9",
   "description": "music streaming server",
   "main": "cli-boot-wrapper.js",
   "bin": {