diff --git a/build.gradle b/build.gradle
index 94676a5e2..63bb40ca5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -343,7 +343,7 @@ dependencies {
     compile "com.android.support:design:$supportLibVersion"
     compile "com.android.support:recyclerview-v7:$supportLibVersion"
     compile "com.android.support:customtabs:$supportLibVersion"
-    compile "com.android.support:support-emoji:$supportLibVersion"
+    compile "com.android.support:support-emoji-bundled:$supportLibVersion"
     compile "com.google.android.gms:play-services-base:$playServicesVersion"
     compile "com.google.android.gms:play-services-auth:$playServicesVersion"
     compile "com.google.android.gms:play-services-identity:$playServicesVersion"
diff --git a/irccloud-android.iml b/irccloud-android.iml
index 5e458f96d..b276a5c39 100644
--- a/irccloud-android.iml
+++ b/irccloud-android.iml
@@ -112,6 +112,7 @@
     <orderEntry type="library" name="com.android.databinding:baseLibrary:3.0.0@jar" level="project" />
     <orderEntry type="library" name="org.solovyev.android.views:linear-layout-manager-0.5" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="com.android.support:support-emoji-bundled-27.0.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-utils-27.0.0" level="project" />
     <orderEntry type="library" name="com.fasterxml.jackson.core:jackson-databind:2.9.2@jar" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
diff --git a/src/com/irccloud/android/IRCCloudApplicationBase.java b/src/com/irccloud/android/IRCCloudApplicationBase.java
index 42d3ed615..cc62a5534 100644
--- a/src/com/irccloud/android/IRCCloudApplicationBase.java
+++ b/src/com/irccloud/android/IRCCloudApplicationBase.java
@@ -35,6 +35,7 @@
 import android.support.annotation.Nullable;
 import android.support.text.emoji.EmojiCompat;
 import android.support.text.emoji.FontRequestEmojiCompatConfig;
+import android.support.text.emoji.bundled.BundledEmojiCompatConfig;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.provider.FontRequest;
 import android.util.Log;
@@ -80,7 +81,7 @@ public void onCreate() {
         FlowManager.init(new FlowConfig.Builder(this).build());
 
         if(Build.VERSION.SDK_INT >= 19)
-            EmojiCompat.init(new FontRequestEmojiCompatConfig(getApplicationContext(), new FontRequest(
+            /*EmojiCompat.init(new FontRequestEmojiCompatConfig(getApplicationContext(), new FontRequest(
                     "com.google.android.gms.fonts",
                     "com.google.android.gms",
                     "Noto Color Emoji Compat",
@@ -99,8 +100,8 @@ public void onFailed(@Nullable Throwable throwable) {
                             Log.e("IRCCloud", "EmojiCompat initialization failed: ", throwable);
                             Crashlytics.logException(throwable);
                         }
-                    }));
-        //EmojiCompat.init(new BundledEmojiCompatConfig(this).setReplaceAll(!prefs.getBoolean("preferSystemEmoji", true)));
+                    }));*/
+        EmojiCompat.init(new BundledEmojiCompatConfig(this).setReplaceAll(!prefs.getBoolean("preferSystemEmoji", true)));
         NetworkConnection.getInstance().registerForConnectivity();
 
         //Disable HTTP keep-alive for our app, as some versions of Android will return an empty response