diff --git a/internal/agentdeployer/agent.go b/internal/agentdeployer/agent.go
index c3308b1cfd..493fd2b03f 100644
--- a/internal/agentdeployer/agent.go
+++ b/internal/agentdeployer/agent.go
@@ -287,19 +287,14 @@ func (d *DockerComposeAgentDeployer) installDockerCompose(ctx context.Context, a
 	if err != nil {
 		return "", fmt.Errorf("failed to load config from profile: %w", err)
 	}
-	enrollmentToken := ""
-	if config.ElasticsearchAPIKey != "" {
-		// TODO: Review if this is the correct place to get the enrollment token.
-		kibanaClient, err := stack.NewKibanaClientFromProfile(d.profile)
-		if err != nil {
-			return "", fmt.Errorf("failed to create kibana client: %w", err)
-		}
-		enrollmentToken, err = kibanaClient.GetEnrollmentTokenForPolicyID(ctx, agentInfo.Policy.ID)
-		if err != nil {
-			return "", fmt.Errorf("failed to get enrollment token for policy %q: %w", agentInfo.Policy.Name, err)
-		}
+	kibanaClient, err := stack.NewKibanaClientFromProfile(d.profile)
+	if err != nil {
+		return "", fmt.Errorf("failed to create kibana client: %w", err)
+	}
+	enrollmentToken, err := kibanaClient.GetEnrollmentTokenForPolicyID(ctx, agentInfo.Policy.ID)
+	if err != nil {
+		return "", fmt.Errorf("failed to get enrollment token for policy %q: %w", agentInfo.Policy.Name, err)
 	}
-
 	// TODO: Include these settings more explicitly in `config`.
 	fleetURL := "https://fleet-server:8220"
 	kibanaHost := "https://kibana:5601"
diff --git a/internal/agentdeployer/kubernetes.go b/internal/agentdeployer/kubernetes.go
index eb9434e746..2c25f9214f 100644
--- a/internal/agentdeployer/kubernetes.go
+++ b/internal/agentdeployer/kubernetes.go
@@ -199,19 +199,14 @@ func getElasticAgentYAML(ctx context.Context, profile *profile.Profile, agentInf
 		stackVersion = version
 	}
 
-	enrollmentToken := ""
-	if config.ElasticsearchAPIKey != "" {
-		// TODO: Review if this is the correct place to get the enrollment token.
-		kibanaClient, err := stack.NewKibanaClientFromProfile(profile)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create kibana client: %w", err)
-		}
-		enrollmentToken, err = kibanaClient.GetEnrollmentTokenForPolicyID(ctx, agentInfo.Policy.ID)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get enrollment token for policy %q: %w", agentInfo.Policy.Name, err)
-		}
+	kibanaClient, err := stack.NewKibanaClientFromProfile(profile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create kibana client: %w", err)
+	}
+	enrollmentToken, err := kibanaClient.GetEnrollmentTokenForPolicyID(ctx, agentInfo.Policy.ID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get enrollment token for policy %q: %w", agentInfo.Policy.Name, err)
 	}
-
 	// default to stack version if no override is provided
 	agentVersion := stackVersion
 	if overrideAgentVersion != "" {