diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
index 040d83871..554bc1755 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
@@ -92,7 +92,6 @@ public class BriarApplicationImpl extends Application
 				Localizer.getInstance().setLocale(base));
 		setTheme(base, prefs);
 		ACRA.init(this);
-		EmojiManager.install(new GoogleEmojiProvider());
 	}
 
 	@Override
@@ -114,6 +113,7 @@ public class BriarApplicationImpl extends Application
 		LOG.info("Created");
 
 		applicationComponent = createApplicationComponent();
+		EmojiManager.install(new GoogleEmojiProvider());
 	}
 
 	protected AndroidComponent createApplicationComponent() {
diff --git a/briar-android/src/test/java/org/briarproject/briar/android/TestBriarApplication.java b/briar-android/src/test/java/org/briarproject/briar/android/TestBriarApplication.java
index 024c62b14..2c0cb2a38 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/TestBriarApplication.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/TestBriarApplication.java
@@ -4,6 +4,9 @@ import android.app.Application;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
+import com.vanniktech.emoji.EmojiManager;
+import com.vanniktech.emoji.google.GoogleEmojiProvider;
+
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.briar.BriarCoreModule;
 
@@ -41,6 +44,7 @@ public class TestBriarApplication extends Application
 		BrambleCoreModule.initEagerSingletons(applicationComponent);
 		BriarCoreModule.initEagerSingletons(applicationComponent);
 		AndroidEagerSingletons.initEagerSingletons(applicationComponent);
+		EmojiManager.install(new GoogleEmojiProvider());
 	}
 
 	@Override