diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index f1d88a70..c4efd535 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -728,11 +728,11 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                             } else if (emojisList == null) {
                                 if (emojis.containsKey(BaseMainActivity.currentInstance)) {
                                     emojisList = emojis.get(BaseMainActivity.currentInstance);
-                                    if (emojisList == null) {
-                                        return;
-                                    }
                                 }
                             }
+                            if (emojisList == null) {
+                                return;
+                            }
                             for (Emoji emoji : emojisList) {
                                 if (shortcode != null && emoji.shortcode.contains(shortcode)) {
                                     emojisToDisplay.add(emoji);