diff --git a/config/site_settings.yml b/config/site_settings.yml
index 7582f442ad..a8acafc33d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -568,7 +568,7 @@ posting:
     default: true
     client: true
   emoji_set:
-    default: 'emoji_one'
+    default: 'twitter'
     client: true
     enum: 'EmojiSetSiteSetting'
   enforce_square_emoji: