diff --git a/app/notification_push_test.go b/app/notification_push_test.go
index 92f570fb77..5720c1bced 100644
--- a/app/notification_push_test.go
+++ b/app/notification_push_test.go
@@ -1152,8 +1152,10 @@ func TestClearPushNotificationSync(t *testing.T) {
 	mockStore.On("Session").Return(&mockSessionStore)
 	mockStore.On("GetDBSchemaVersion").Return(1, nil)
 
+	// When CRT is disabled
 	th.App.UpdateConfig(func(cfg *model.Config) {
 		*cfg.EmailSettings.PushNotificationServer = pushServer.URL
+		*cfg.ServiceSettings.CollapsedThreads = model.CollapsedThreadsDisabled
 	})
 
 	err := th.App.clearPushNotificationSync(sess1.Id, "user1", "channel1", "")
diff --git a/model/config.go b/model/config.go
index fd89cde57d..c1a36f71e7 100644
--- a/model/config.go
+++ b/model/config.go
@@ -827,7 +827,7 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
 	}
 
 	if s.CollapsedThreads == nil {
-		s.CollapsedThreads = NewString(CollapsedThreadsDisabled)
+		s.CollapsedThreads = NewString(CollapsedThreadsAlwaysOn)
 	}
 
 	if s.ManagedResourcePaths == nil {