diff --git a/model/feature_flags.go b/model/feature_flags.go
index 2566109448..f9d28a325f 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -44,7 +44,7 @@ func (f *FeatureFlags) SetDefaults() {
 	f.TestFeature = "off"
 	f.TestBoolFeature = false
 	f.CloudDelinquentEmailJobsEnabled = false
-	f.CollapsedThreads = false
+	f.CollapsedThreads = true
 	f.EnableRemoteClusterService = false
 	f.AppsEnabled = false