diff --git a/src/components/MessageInput/__tests__/MessageInput.test.js b/src/components/MessageInput/__tests__/MessageInput.test.js
index 4b79245d8e..ae3745ba43 100644
--- a/src/components/MessageInput/__tests__/MessageInput.test.js
+++ b/src/components/MessageInput/__tests__/MessageInput.test.js
@@ -31,33 +31,6 @@ import {
 
 expect.extend(toHaveNoViolations);
 
-jest.mock('react', () => {
-  const React = jest.requireActual('react');
-  const Suspense = ({ children }) => children;
-
-  const lazy = jest.fn().mockImplementation((fn) => {
-    const Component = (props) => {
-      const [C, setC] = React.useState();
-
-      React.useEffect(() => {
-        fn().then((v) => {
-          setC(v);
-        });
-      }, []);
-
-      return C ? <C.default {...props} /> : null;
-    };
-
-    return Component;
-  });
-
-  return {
-    ...React,
-    lazy,
-    Suspense,
-  };
-});
-
 jest.mock('../../Channel/utils', () => ({ makeAddNotifications: jest.fn }));
 
 let chatClient;
diff --git a/src/context/DefaultEmoji.ts b/src/context/DefaultEmoji.ts
new file mode 100644
index 0000000000..718b040d4f
--- /dev/null
+++ b/src/context/DefaultEmoji.ts
@@ -0,0 +1,4 @@
+// @ts-expect-error
+import NimbleEmoji from 'emoji-mart/dist/components/emoji/nimble-emoji';
+
+export { NimbleEmoji as default };
diff --git a/src/context/DefaultEmojiPicker.ts b/src/context/DefaultEmojiPicker.ts
new file mode 100644
index 0000000000..fbb22604ff
--- /dev/null
+++ b/src/context/DefaultEmojiPicker.ts
@@ -0,0 +1,4 @@
+// @ts-expect-error
+import NimblePicker from 'emoji-mart/dist/components/picker/nimble-picker';
+
+export { NimblePicker as default };
diff --git a/src/context/EmojiContext.tsx b/src/context/EmojiContext.tsx
index f1cc337068..838e40f4e1 100644
--- a/src/context/EmojiContext.tsx
+++ b/src/context/EmojiContext.tsx
@@ -49,17 +49,9 @@ export type EmojiContextValue = {
   EmojiPicker?: React.ComponentType<NimblePickerProps>;
 };
 
-const DefaultEmoji = React.lazy(async () => {
-  //@ts-expect-error
-  const emoji = await import('emoji-mart/dist/components/emoji/nimble-emoji.js');
-  return { default: emoji.default };
-});
-
-const DefaultEmojiPicker = React.lazy(async () => {
-  // @ts-expect-error
-  const emojiPicker = await import('emoji-mart/dist/components/picker/nimble-picker.js');
-  return { default: emojiPicker.default };
-});
+const DefaultEmoji = React.lazy(() => import('./DefaultEmoji'));
+
+const DefaultEmojiPicker = React.lazy(() => import('./DefaultEmojiPicker'));
 
 export const EmojiContext = React.createContext<EmojiContextValue | undefined>(undefined);