diff --git a/src/components/pure-status.tsx b/src/components/pure-status.tsx
index d7cb46e3f..9aa081836 100644
--- a/src/components/pure-status.tsx
+++ b/src/components/pure-status.tsx
@@ -184,7 +184,7 @@ const PureStatus: React.FC<IPureStatus> = (props) => {
     if ((e && e.shiftKey) || !boostModal) {
       modalReblog();
     } else {
-      dispatch(openModal('BOOST', { status: statusImmutable, onReblog: modalReblog })); // fix later, ReplyIndicator component: status.emojis.toJS is not a function
+      dispatch(openModal('BOOST', { status: status, onReblog: modalReblog }));
     }
   };
 
diff --git a/src/features/compose/components/reply-indicator.tsx b/src/features/compose/components/reply-indicator.tsx
index 52b265ab6..46c3e6e08 100644
--- a/src/features/compose/components/reply-indicator.tsx
+++ b/src/features/compose/components/reply-indicator.tsx
@@ -50,7 +50,7 @@ const ReplyIndicator: React.FC<IReplyIndicator> = ({ className, status, hideActi
         className='break-words'
         size='sm'
         direction={getTextDirection(status.search_index)}
-        emojis={status.emojis.toJS()}
+        emojis={status?.emojis?.toJS() ?? status.emojis}
         mentions={status.mentions.toJS()}
         html={{ __html: status.content }}
       />