diff --git a/webapp/channels/src/components/edit_post/edit_post.tsx b/webapp/channels/src/components/edit_post/edit_post.tsx
index 2edc6561c0..d27e1e7a8e 100644
--- a/webapp/channels/src/components/edit_post/edit_post.tsx
+++ b/webapp/channels/src/components/edit_post/edit_post.tsx
@@ -463,7 +463,6 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
         }
     };
 
-    const getEmojiContainerRef = useCallback(() => textboxRef.current, [textboxRef]);
     const getEmojiTargetRef = useCallback(() => emojiButtonRef.current, [emojiButtonRef]);
 
     let emojiPicker = null;
@@ -473,7 +472,6 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
             <>
                 <EmojiPickerOverlay
                     show={showEmojiPicker}
-                    container={getEmojiContainerRef}
                     target={getEmojiTargetRef}
                     onHide={hideEmojiPicker}
                     onEmojiClick={handleEmojiClick}
diff --git a/webapp/channels/src/components/emoji_picker/emoji_picker_overlay/emoji_picker_overlay.tsx b/webapp/channels/src/components/emoji_picker/emoji_picker_overlay/emoji_picker_overlay.tsx
index a456a50a31..d3a9058f57 100644
--- a/webapp/channels/src/components/emoji_picker/emoji_picker_overlay/emoji_picker_overlay.tsx
+++ b/webapp/channels/src/components/emoji_picker/emoji_picker_overlay/emoji_picker_overlay.tsx
@@ -16,7 +16,6 @@ import EmojiPickerTabs from '../emoji_picker_tabs';
 import type {PropsFromRedux} from './index';
 
 export interface Props extends PropsFromRedux {
-    container?: () => ReactNode;
     target: () => ReactNode;
     onEmojiClick: (emoji: Emoji) => void;
     onGifClick?: (gif: string) => void;
@@ -93,7 +92,6 @@ export default class EmojiPickerOverlay extends React.PureComponent<Props> {
                 show={show}
                 placement={this.props.placement ?? placement}
                 rootClose={!isMobileView}
-                container={this.props.container}
                 onHide={this.props.onHide}
                 target={target}
                 animation={false}