diff --git a/config/client.go b/config/client.go
index 3c1eca98cb8..327201493ef 100644
--- a/config/client.go
+++ b/config/client.go
@@ -78,6 +78,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
 	props["GfycatApiKey"] = *c.ServiceSettings.GfycatApiKey
 	props["GfycatApiSecret"] = *c.ServiceSettings.GfycatApiSecret
 	props["MaxFileSize"] = strconv.FormatInt(*c.FileSettings.MaxFileSize, 10)
+	props["ShowOutOfOfficeInStatusDropdown"] = strconv.FormatBool(*c.ServiceSettings.ShowOutOfOfficeInStatusDropdown)
 
 	props["MaxNotificationsPerChannel"] = strconv.FormatInt(*c.TeamSettings.MaxNotificationsPerChannel, 10)
 	props["EnableConfirmNotificationsToChannel"] = strconv.FormatBool(*c.TeamSettings.EnableConfirmNotificationsToChannel)
diff --git a/model/config.go b/model/config.go
index 378933abc77..7ace67883cb 100644
--- a/model/config.go
+++ b/model/config.go
@@ -310,6 +310,7 @@ type ServiceSettings struct {
 	DisableBotsWhenOwnerIsDeactivated                 *bool `restricted:"true"`
 	EnableBotAccountCreation                          *bool
 	EnableSVGs                                        *bool
+	ShowOutOfOfficeInStatusDropdown                   *bool
 }
 
 func (s *ServiceSettings) SetDefaults(isUpdate bool) {
@@ -678,6 +679,10 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
 			s.EnableSVGs = NewBool(false)
 		}
 	}
+
+	if s.ShowOutOfOfficeInStatusDropdown == nil {
+		s.ShowOutOfOfficeInStatusDropdown = NewBool(false)
+	}
 }
 
 type ClusterSettings struct {