diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go
index f2acf6615..b1a41e8a1 100644
--- a/api/cmd/portainer/main.go
+++ b/api/cmd/portainer/main.go
@@ -376,13 +376,18 @@ func main() {
 
 	jwtService := initJWTService(!*flags.NoAuth)
 
+	ldapService := initLDAPService()
+
+	gitService := initGitService()
+
 	cryptoService := initCryptoService()
 
 	digitalSignatureService := initDigitalSignatureService()
 
-	ldapService := initLDAPService()
-
-	gitService := initGitService()
+	err := initKeyPair(fileService, digitalSignatureService)
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	clientFactory := initClientFactory(digitalSignatureService)
 
@@ -398,11 +403,6 @@ func main() {
 		endpointManagement = false
 	}
 
-	err = initKeyPair(fileService, digitalSignatureService)
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	swarmStackManager, err := initSwarmStackManager(*flags.Assets, *flags.Data, digitalSignatureService, fileService)
 	if err != nil {
 		log.Fatal(err)