diff --git a/app/server.go b/app/server.go
index dad8366067..4bd03b099d 100644
--- a/app/server.go
+++ b/app/server.go
@@ -304,6 +304,8 @@ func NewServer(options ...Option) (*Server, error) {
 		s.Log.ChangeLevels(utils.MloggerConfigFromLoggerConfig(&after.LogSettings))
 	})
 
+	s.HTTPService = httpservice.MakeHTTPService(s.FakeApp())
+
 	err := s.RunOldAppInitalization()
 	if err != nil {
 		return nil, err
@@ -315,8 +317,6 @@ func NewServer(options ...Option) (*Server, error) {
 		s.InitEmailBatching()
 	})
 
-	s.HTTPService = httpservice.MakeHTTPService(s.FakeApp())
-
 	mlog.Info(fmt.Sprintf("Current version is %v (%v/%v/%v/%v)", model.CurrentVersion, model.BuildNumber, model.BuildDate, model.BuildHash, model.BuildHashEnterprise))
 	mlog.Info(fmt.Sprintf("Enterprise Enabled: %v", model.BuildEnterpriseReady))
 	pwd, _ := os.Getwd()