diff --git a/ExpressAPI/src/config/Config.ts b/ExpressAPI/src/config/Config.ts
index e191f2162d1780d14fe48c39c9e1c934916e4cdb..58a659cbf15fb66685cff315e84f8d82dfb59e71 100644
--- a/ExpressAPI/src/config/Config.ts
+++ b/ExpressAPI/src/config/Config.ts
@@ -72,7 +72,7 @@ class Config {
 
     constructor() {
         this.api = {
-            port: Number(process.env.API_PORT || 30992)
+            port: Number(process.env.API_PORT || 0)
         };
 
         this.requestClientValidation = JSON5.parse(process.env.REQUEST_CLIENT_VALIDATION || '{"version": {}}');
diff --git a/ExpressAPI/src/init.ts b/ExpressAPI/src/init.ts
index 4308bd469638f3e955a849d472bd480f214ce40e..5c8026f79fd773ecd7b7defb81d1c01913fcd66f 100644
--- a/ExpressAPI/src/init.ts
+++ b/ExpressAPI/src/init.ts
@@ -7,8 +7,7 @@ import './shared/helpers/TypeScriptExtensions.js';
 
 if ( cluster.isPrimary ) {
     if ( process.env.NODE_ENV && process.env.NODE_ENV === 'production' ) {
-        dotenvExpand.expand(dotenv.config({ path: path.join(__dirname, '../.env') }));
-        dotenvExpand.expand(dotenv.config({ path: path.join(__dirname, '../config.env') }));
+        dotenvExpand.expand(dotenv.config());
     } else {
         dotenv.config({ path: path.join(__dirname, '../.env.keys') });
         dotenvExpand.expand(dotenv.config({ DOTENV_KEY: process.env.DOTENV_KEY_DEVELOPMENT }));