diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index 95c08acd4..0e5af41ec 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -328,7 +328,7 @@ public void onConfigurationChanged(Configuration newConfig) {
       container.hideAttachedInput(true);
     }
 
-    reloadEmojiPicker();
+    emojiPicker = null; // force reloading next time onEmojiToggle() is called
     initializeBackground();
   }