diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go
index e4c123b5c8..04c0a20ec0 100644
--- a/cmd/mattermost/commands/server.go
+++ b/cmd/mattermost/commands/server.go
@@ -48,6 +48,8 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform
 		app.ConfigFile(configFileLocation),
 		app.RunJobs,
 		app.JoinCluster,
+		app.StartElasticsearch,
+		app.StartMetrics,
 	}
 	if disableConfigWatch {
 		options = append(options, app.DisableConfigWatch)