diff --git a/config/client.go b/config/client.go
index 7315ab6898..00041076d1 100644
--- a/config/client.go
+++ b/config/client.go
@@ -16,6 +16,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li
 	props := GenerateLimitedClientConfig(c, telemetryID, license)
 
 	props["EnableCustomUserStatuses"] = strconv.FormatBool(*c.TeamSettings.EnableCustomUserStatuses)
+	props["EnableLastActiveTime"] = strconv.FormatBool(*c.TeamSettings.EnableLastActiveTime)
 	props["EnableUserDeactivation"] = strconv.FormatBool(*c.TeamSettings.EnableUserDeactivation)
 	props["RestrictDirectMessage"] = *c.TeamSettings.RestrictDirectMessage
 	props["TeammateNameDisplay"] = *c.TeamSettings.TeammateNameDisplay
diff --git a/model/config.go b/model/config.go
index 967cff1dc8..2c0f0ca1e7 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1959,6 +1959,7 @@ type TeamSettings struct {
 	CustomBrandText           *string `access:"site_customization"`
 	CustomDescriptionText     *string `access:"site_customization"`
 	RestrictDirectMessage     *string `access:"site_users_and_teams"`
+	EnableLastActiveTime      *bool   `access:"site_users_and_teams"`
 	// In seconds.
 	UserStatusAwayTimeout               *int64   `access:"experimental_features"`
 	MaxChannelsPerTeam                  *int64   `access:"site_users_and_teams"`
@@ -1998,6 +1999,10 @@ func (s *TeamSettings) SetDefaults() {
 		s.EnableCustomUserStatuses = NewBool(true)
 	}
 
+	if s.EnableLastActiveTime == nil {
+		s.EnableLastActiveTime = NewBool(true)
+	}
+
 	if s.EnableCustomBrand == nil {
 		s.EnableCustomBrand = NewBool(false)
 	}
diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go
index 3168f61e35..2334c1c9fb 100644
--- a/services/telemetry/telemetry.go
+++ b/services/telemetry/telemetry.go
@@ -456,6 +456,7 @@ func (ts *TelemetryService) trackConfig() {
 		"enable_open_server":                      *cfg.TeamSettings.EnableOpenServer,
 		"enable_user_deactivation":                *cfg.TeamSettings.EnableUserDeactivation,
 		"enable_custom_user_statuses":             *cfg.TeamSettings.EnableCustomUserStatuses,
+		"enable_last_active_time":                 *cfg.TeamSettings.EnableLastActiveTime,
 		"enable_custom_brand":                     *cfg.TeamSettings.EnableCustomBrand,
 		"restrict_direct_message":                 *cfg.TeamSettings.RestrictDirectMessage,
 		"max_notifications_per_channel":           *cfg.TeamSettings.MaxNotificationsPerChannel,