@@ -507,7 +507,7 @@ func (cli *DaemonCli) initMiddlewares(s *apiserver.Server, cfg *apiserver.Config

 	vm := middleware.NewVersionMiddleware(v, api.DefaultVersion, api.MinVersion)

 	s.UseMiddleware(vm)

-	if cfg.EnableCors {

+	if cfg.EnableCors || cfg.CorsHeaders != "" {

 		c := middleware.NewCORSMiddleware(cfg.CorsHeaders)

 		s.UseMiddleware(c)

 	}