diff --git a/server/config/client.go b/server/config/client.go
index dc8517de038..23a9793c63e 100644
--- a/server/config/client.go
+++ b/server/config/client.go
@@ -188,7 +188,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li
 
 		if *license.Features.Cluster {
 			props["EnableMetrics"] = strconv.FormatBool(*c.MetricsSettings.Enable)
-			props["EnableClientMetrics"] = strconv.FormatBool(c.FeatureFlags.ClientMetrics && *c.MetricsSettings.EnableClientMetrics)
+			props["EnableClientMetrics"] = strconv.FormatBool(*c.MetricsSettings.Enable && *c.MetricsSettings.EnableClientMetrics)
 			props["EnableNotificationMetrics"] = strconv.FormatBool(c.FeatureFlags.NotificationMonitoring && *c.MetricsSettings.EnableNotificationMetrics)
 		}
 
diff --git a/server/public/model/feature_flags.go b/server/public/model/feature_flags.go
index faa8c34a5b5..b623bb83c11 100644
--- a/server/public/model/feature_flags.go
+++ b/server/public/model/feature_flags.go
@@ -57,8 +57,6 @@ type FeatureFlags struct {
 	NotificationMonitoring bool
 
 	ExperimentalAuditSettingsSystemConsoleUI bool
-
-	ClientMetrics bool
 }
 
 func (f *FeatureFlags) SetDefaults() {
@@ -83,7 +81,6 @@ func (f *FeatureFlags) SetDefaults() {
 	f.WebSocketEventScope = false
 	f.NotificationMonitoring = true
 	f.ExperimentalAuditSettingsSystemConsoleUI = false
-	f.ClientMetrics = false
 }
 
 // ToMap returns the feature flags as a map[string]string