diff --git a/src/components/middle/message/Poll.tsx b/src/components/middle/message/Poll.tsx
index 9b113c6b5..deacd7804 100644
--- a/src/components/middle/message/Poll.tsx
+++ b/src/components/middle/message/Poll.tsx
@@ -260,7 +260,7 @@ const Poll: FC<OwnProps & StateProps & DispatchProps> = ({
   return (
     <div className="Poll" dir={lang.isRtl ? 'auto' : 'ltr'}>
       {renderSolution()}
-      <div className="poll-question">{renderText(summary.question)}</div>
+      <div className="poll-question">{renderText(summary.question, ['emoji', 'br'])}</div>
       <div className="poll-type">
         {lang(getPollTypeString(summary))}
         {renderRecentVoters()}
diff --git a/src/components/right/PollResults.tsx b/src/components/right/PollResults.tsx
index fb015a562..f7315492c 100644
--- a/src/components/right/PollResults.tsx
+++ b/src/components/right/PollResults.tsx
@@ -5,6 +5,7 @@ import { ApiMessage, ApiChat } from '../../api/types';
 import { selectChat, selectChatMessage } from '../../modules/selectors';
 import { buildCollectionByKey } from '../../util/iteratees';
 import { getMessagePoll } from '../../modules/helpers';
+import renderText from '../common/helpers/renderText';
 import useLang from '../../hooks/useLang';
 import useHistoryBack from '../../hooks/useHistoryBack';
 
@@ -47,7 +48,7 @@ const PollResults: FC<OwnProps & StateProps> = ({
 
   return (
     <div className="PollResults" dir={lang.isRtl ? 'rtl' : undefined}>
-      <h3 className="poll-question" dir="auto">{summary.question}</h3>
+      <h3 className="poll-question" dir="auto">{renderText(summary.question, ['emoji', 'br'])}</h3>
       <div className="poll-results-list custom-scroll">
         {lastSyncTime && summary.answers.map((answer) => (
           <PollAnswerResults