diff --git a/model/config.go b/model/config.go
index b68cfdb09f..04fbd8acc8 100644
--- a/model/config.go
+++ b/model/config.go
@@ -618,7 +618,7 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
 	}
 
 	if s.EnableCustomEmoji == nil {
-		s.EnableCustomEmoji = NewBool(false)
+		s.EnableCustomEmoji = NewBool(true)
 	}
 
 	if s.EnableEmojiPicker == nil {