diff --git a/config/config.json b/config/config.json
index 3401a5e4f0..a07cf5c196 100644
--- a/config/config.json
+++ b/config/config.json
@@ -38,7 +38,7 @@
         "WebsocketPort": 80,
         "WebserverMode": "gzip",
         "EnableCustomEmoji": false,
-        "EnableEmojiPicker": false,
+        "EnableEmojiPicker": true,
         "RestrictCustomEmojiCreation": "all",
         "RestrictPostDelete": "all",
         "AllowEditPost": "always",
diff --git a/model/config.go b/model/config.go
index b7526925f3..38d27d8bb3 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1033,7 +1033,7 @@ func (o *Config) SetDefaults() {
 
 	if o.ServiceSettings.EnableEmojiPicker == nil {
 		o.ServiceSettings.EnableEmojiPicker = new(bool)
-		*o.ServiceSettings.EnableEmojiPicker = false
+		*o.ServiceSettings.EnableEmojiPicker = true
 	}
 
 	if o.ServiceSettings.RestrictCustomEmojiCreation == nil {