diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
index b0cf354450..ac72463c4e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
@@ -141,7 +141,7 @@ public class EmojiPageView extends RecyclerView implements VariationSelectorList
 
   @Override
   protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
-    if (visibility != VISIBLE) {
+    if (visibility != VISIBLE && popup != null) {
       popup.dismiss();
     }
   }