diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts
index eea628ff..3a2331c2 100644
--- a/packages/core.gbapp/services/GBConfigService.ts
+++ b/packages/core.gbapp/services/GBConfigService.ts
@@ -43,12 +43,12 @@ import { GBLog } from 'botlib';
  */
 export class GBConfigService {
   public static getServerPort(): number {
-    if (process.env.port !== undefined) {
-      return Number(process.env.port);
-    }
-    if (process.env.PORT !== undefined) {
+    if (process.env.PORT !== null) {
       return Number(process.env.PORT);
     }
+    if (process.env.port !== null) {
+      return Number(process.env.port);
+    }
 
     return 4242;
   }