diff --git a/src/features/emoji/components/emoji-picker-dropdown.tsx b/src/features/emoji/components/emoji-picker-dropdown.tsx
index fcc9c05c3..ae5231fb5 100644
--- a/src/features/emoji/components/emoji-picker-dropdown.tsx
+++ b/src/features/emoji/components/emoji-picker-dropdown.tsx
@@ -215,8 +215,8 @@ const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({
 
   return (
     visible ? (
-      <RenderAfter update={update}>
-        <Suspense>
+      <Suspense>
+        <RenderAfter update={update}>
           <EmojiPicker
             custom={withCustom ? [{ emojis: buildCustomEmojis(customEmojis) }] : undefined}
             title={title}
@@ -232,8 +232,8 @@ const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({
             skinTonePosition='search'
             previewPosition='none'
           />
-        </Suspense>
-      </RenderAfter>
+        </RenderAfter>
+      </Suspense>
     ) : null
   );
 };