diff --git a/app/diagnostics.go b/app/diagnostics.go
index 745a953e53..bf463ab137 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -537,7 +537,6 @@ func (a *App) trackConfig() {
 	a.SendDiagnostic(TRACK_CONFIG_EXPERIMENTAL, map[string]interface{}{
 		"client_side_cert_enable":            *cfg.ExperimentalSettings.ClientSideCertEnable,
 		"isdefault_client_side_cert_check":   isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.CLIENT_SIDE_CERT_CHECK_PRIMARY_AUTH),
-		"enable_post_metadata":               !*cfg.ExperimentalSettings.DisablePostMetadata,
 		"link_metadata_timeout_milliseconds": *cfg.ExperimentalSettings.LinkMetadataTimeoutMilliseconds,
 		"enable_click_to_reply":              *cfg.ExperimentalSettings.EnableClickToReply,
 		"restrict_system_admin":              *cfg.ExperimentalSettings.RestrictSystemAdmin,
diff --git a/app/post_metadata.go b/app/post_metadata.go
index 729afae99a..a877cf216e 100644
--- a/app/post_metadata.go
+++ b/app/post_metadata.go
@@ -59,10 +59,6 @@ func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool, isE
 	// Proxy image links before constructing metadata so that requests go through the proxy
 	post = a.PostWithProxyAddedToImageURLs(post)
 
-	if *a.Config().ExperimentalSettings.DisablePostMetadata {
-		return post
-	}
-
 	post.Metadata = &model.PostMetadata{}
 
 	// Emojis and reaction counts
diff --git a/app/post_metadata_test.go b/app/post_metadata_test.go
index f37b9b72af..f14ed1e159 100644
--- a/app/post_metadata_test.go
+++ b/app/post_metadata_test.go
@@ -32,10 +32,6 @@ func TestPreparePostListForClient(t *testing.T) {
 	th := Setup(t).InitBasic()
 	defer th.TearDown()
 
-	th.App.UpdateConfig(func(cfg *model.Config) {
-		*cfg.ExperimentalSettings.DisablePostMetadata = false
-	})
-
 	postList := model.NewPostList()
 	for i := 0; i < 5; i++ {
 		postList.AddPost(&model.Post{})
@@ -68,7 +64,6 @@ func TestPreparePostForClient(t *testing.T) {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.ServiceSettings.EnableLinkPreviews = true
 			*cfg.ImageProxySettings.Enable = false
-			*cfg.ExperimentalSettings.DisablePostMetadata = false
 		})
 
 		return th
@@ -393,24 +388,6 @@ func TestPreparePostForClient(t *testing.T) {
 			}, imageDimensions["https://github.com/hmhealey/test-files/raw/master/icon.png"])
 		})
 	})
-
-	t.Run("when disabled", func(t *testing.T) {
-		th := setup()
-		defer th.TearDown()
-
-		th.App.UpdateConfig(func(cfg *model.Config) {
-			*cfg.ExperimentalSettings.DisablePostMetadata = true
-		})
-
-		post := th.CreatePost(th.BasicChannel)
-		post = th.App.PreparePostForClient(post, false, false)
-
-		assert.Nil(t, post.Metadata)
-
-		b := post.ToJson()
-
-		assert.NotContains(t, string(b), "metadata", "json shouldn't include a metadata field, not even a falsey one")
-	})
 }
 
 func TestPreparePostForClientWithImageProxy(t *testing.T) {
@@ -424,7 +401,6 @@ func TestPreparePostForClientWithImageProxy(t *testing.T) {
 			*cfg.ImageProxySettings.ImageProxyType = "atmos/camo"
 			*cfg.ImageProxySettings.RemoteImageProxyURL = "https://127.0.0.1"
 			*cfg.ImageProxySettings.RemoteImageProxyOptions = "foo"
-			*cfg.ExperimentalSettings.DisablePostMetadata = false
 		})
 
 		return th
diff --git a/app/post_test.go b/app/post_test.go
index 6609ea7b46..0b0a585296 100644
--- a/app/post_test.go
+++ b/app/post_test.go
@@ -668,7 +668,6 @@ func TestCreatePost(t *testing.T) {
 
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.ServiceSettings.SiteURL = "http://mymattermost.com"
-			*cfg.ExperimentalSettings.DisablePostMetadata = true
 			*cfg.ImageProxySettings.Enable = true
 			*cfg.ImageProxySettings.ImageProxyType = "atmos/camo"
 			*cfg.ImageProxySettings.RemoteImageProxyURL = "https://127.0.0.1"
@@ -697,7 +696,6 @@ func TestPatchPost(t *testing.T) {
 
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.ServiceSettings.SiteURL = "http://mymattermost.com"
-			*cfg.ExperimentalSettings.DisablePostMetadata = true
 			*cfg.ImageProxySettings.Enable = true
 			*cfg.ImageProxySettings.ImageProxyType = "atmos/camo"
 			*cfg.ImageProxySettings.RemoteImageProxyURL = "https://127.0.0.1"
@@ -747,7 +745,6 @@ func TestUpdatePost(t *testing.T) {
 
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.ServiceSettings.SiteURL = "http://mymattermost.com"
-			*cfg.ExperimentalSettings.DisablePostMetadata = true
 			*cfg.ImageProxySettings.Enable = true
 			*cfg.ImageProxySettings.ImageProxyType = "atmos/camo"
 			*cfg.ImageProxySettings.RemoteImageProxyURL = "https://127.0.0.1"
diff --git a/config/client.go b/config/client.go
index a853bee4dd..bd6d724c0f 100644
--- a/config/client.go
+++ b/config/client.go
@@ -44,7 +44,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
 	props["ExperimentalGroupUnreadChannels"] = *c.ServiceSettings.ExperimentalGroupUnreadChannels
 
 	// This setting is only temporary, so keep using the old setting name for the mobile and web apps
-	props["ExperimentalEnablePostMetadata"] = strconv.FormatBool(!*c.ExperimentalSettings.DisablePostMetadata)
+	props["ExperimentalEnablePostMetadata"] = "true"
 	props["ExperimentalEnableClickToReply"] = strconv.FormatBool(*c.ExperimentalSettings.EnableClickToReply)
 
 	if *c.ServiceSettings.ExperimentalChannelOrganization || *c.ServiceSettings.ExperimentalGroupUnreadChannels != model.GROUP_UNREAD_CHANNELS_DISABLED {
diff --git a/model/config.go b/model/config.go
index f114900b8d..bef05feb75 100644
--- a/model/config.go
+++ b/model/config.go
@@ -756,7 +756,6 @@ func (s *MetricsSettings) SetDefaults() {
 type ExperimentalSettings struct {
 	ClientSideCertEnable            *bool
 	ClientSideCertCheck             *string
-	DisablePostMetadata             *bool  `restricted:"true"`
 	EnableClickToReply              *bool  `restricted:"true"`
 	LinkMetadataTimeoutMilliseconds *int64 `restricted:"true"`
 	RestrictSystemAdmin             *bool  `restricted:"true"`
@@ -771,10 +770,6 @@ func (s *ExperimentalSettings) SetDefaults() {
 		s.ClientSideCertCheck = NewString(CLIENT_SIDE_CERT_CHECK_SECONDARY_AUTH)
 	}
 
-	if s.DisablePostMetadata == nil {
-		s.DisablePostMetadata = NewBool(false)
-	}
-
 	if s.EnableClickToReply == nil {
 		s.EnableClickToReply = NewBool(false)
 	}