diff --git a/src/providers/App.ts b/src/providers/App.ts
index 4959e06..b39d96f 100644
--- a/src/providers/App.ts
+++ b/src/providers/App.ts
@@ -44,6 +44,10 @@ class App {
     }
 
     public loadExpress(): void {
+        if (!Environment.get().WEB_HOST || !Environment.get().WEB_PORT) {
+            Logger.log('warn', 'WEB_HOST or WEB_PORT is not defined in .env, not starting web server');
+            return;
+        }
         Logger.log('info', 'Loading Express');
         Express.init();
     }
diff --git a/src/providers/Express.ts b/src/providers/Express.ts
index 70157bb..aea9bfd 100644
--- a/src/providers/Express.ts
+++ b/src/providers/Express.ts
@@ -30,7 +30,7 @@ class Express {
     }
 
     public end(): void {
-        if(this.server != null)
+        if(this.server)
             this.server.close();
     }