diff --git a/server/channels/app/plugin_test.go b/server/channels/app/plugin_test.go
index 8d39b106e9..2f9e83b486 100644
--- a/server/channels/app/plugin_test.go
+++ b/server/channels/app/plugin_test.go
@@ -1437,6 +1437,18 @@ func TestGetPluginStateOverride(t *testing.T) {
 	t.Run("apps override", func(t *testing.T) {
 		t.Run("without enabled flag", func(t *testing.T) {
 			overrides, value := th.App.ch.getPluginStateOverride("com.mattermost.apps")
+			require.True(t, overrides)
+			require.False(t, value)
+		})
+
+		t.Run("with enabled flag set to true", func(t *testing.T) {
+			os.Setenv("MM_FEATUREFLAGS_APPSENABLED", "true")
+			defer os.Unsetenv("MM_FEATUREFLAGS_APPSENABLED")
+
+			th2 := Setup(t)
+			defer th2.TearDown()
+
+			overrides, value := th2.App.ch.getPluginStateOverride("com.mattermost.apps")
 			require.False(t, overrides)
 			require.False(t, value)
 		})
diff --git a/server/public/model/feature_flags.go b/server/public/model/feature_flags.go
index 8e38ead0c7..b0634f2e24 100644
--- a/server/public/model/feature_flags.go
+++ b/server/public/model/feature_flags.go
@@ -61,7 +61,7 @@ func (f *FeatureFlags) SetDefaults() {
 	f.TestFeature = "off"
 	f.TestBoolFeature = false
 	f.EnableRemoteClusterService = false
-	f.AppsEnabled = true
+	f.AppsEnabled = false
 	f.NormalizeLdapDNs = false
 	f.CallsEnabled = true
 	f.DeprecateCloudFree = false