diff --git a/static/js/settings_display.js b/static/js/settings_display.js
index 22abbd60e3..0e0fc71d40 100644
--- a/static/js/settings_display.js
+++ b/static/js/settings_display.js
@@ -158,18 +158,21 @@ exports.report_emojiset_change = function () {
         }
     }
 
+    var emojiset = page_params.emojiset;
+
     if (page_params.emojiset === 'text') {
-        emoji_success();
-        return;
+        // For `text` emojiset we fallback to `google-blob` emojiset
+        // for displaying emojis in emoji picker and typeahead.
+        emojiset = 'google-blob';
     }
 
     var sprite = new Image();
     sprite.onload = function () {
-        var sprite_css_href = "/static/generated/emoji/" + page_params.emojiset + "-sprite.css";
+        var sprite_css_href = "/static/generated/emoji/" + emojiset + "-sprite.css";
         $("#emoji-spritesheet").attr('href', sprite_css_href);
         emoji_success();
     };
-    sprite.src = "/static/generated/emoji/sheet-" + page_params.emojiset + "-64.png";
+    sprite.src = "/static/generated/emoji/sheet-" + emojiset + "-64.png";
 };
 
 exports.update_page = function () {