diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
index 484e02e5f1..e2f0f1bb96 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
@@ -119,6 +119,10 @@ class AutocompleteEmojiPresenter @AssistedInject constructor(
                 val globalPacks = session.accountDataService().getUserAccountDataEvent(UserAccountDataTypes.TYPE_EMOTE_ROOMS)
                 var packsAdded = 0
                 (globalPacks?.content?.get("rooms") as? Map<*, *>)?.forEach { pack ->
+                    // If entry is empty, it has been disabled as global pack (after being enabled before).
+                    if ((pack.value as? Map<*, *>).isNullOrEmpty()) {
+                        return@forEach
+                    }
                     if (packsAdded >= AutocompleteEmojiController.MAX_CUSTOM_OTHER_ROOMS) {
                         return@forEach
                     }