diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 076e0c0fc1..6a8e479ceb 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -204,13 +204,15 @@ class App {
 		//support application/x-www-form-urlencoded post data
 		this.app.use(bodyParser.urlencoded({ extended: false }));
 
-		this.app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {
-			// Allow access also from frontend when developing
-			res.header('Access-Control-Allow-Origin', 'http://localhost:8080');
-			res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
-			res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, sessionid');
-			next();
-		});
+		if (process.env['NODE_ENV'] !== 'production') {
+			this.app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {
+				// Allow access also from frontend when developing
+				res.header('Access-Control-Allow-Origin', 'http://localhost:8080');
+				res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
+				res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, sessionid');
+				next();
+			});
+		}
 
 
 		this.app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {