diff --git a/ts/messages/helpers.std.ts b/ts/messages/helpers.std.ts
index d5ecf5d3c7..9d492303d8 100644
--- a/ts/messages/helpers.std.ts
+++ b/ts/messages/helpers.std.ts
@@ -76,3 +76,9 @@ export const shouldTryToCopyFromQuotedMessage = ({
 
   return true;
 };
+
+export function isPoll(
+  message: Pick<ReadonlyMessageAttributesType, 'poll'>
+): boolean {
+  return Boolean(message.poll);
+}
diff --git a/ts/state/selectors/message.preload.ts b/ts/state/selectors/message.preload.ts
index 724586c9eb..37ca7987f4 100644
--- a/ts/state/selectors/message.preload.ts
+++ b/ts/state/selectors/message.preload.ts
@@ -137,7 +137,12 @@ import { getConversationColorAttributes } from '../../util/getConversationColorA
 import { DAY, DurationInSeconds } from '../../util/durations/index.std.js';
 import { getStoryReplyText } from '../../util/getStoryReplyText.std.js';
 import type { MessageAttributesWithPaymentEvent } from '../../messages/payments.std.js';
-import { isIncoming, isOutgoing, isStory } from '../../messages/helpers.std.js';
+import {
+  isIncoming,
+  isOutgoing,
+  isPoll,
+  isStory,
+} from '../../messages/helpers.std.js';
 import { messageHasPaymentEvent } from '../../messages/payments.std.js';
 
 import { calculateExpirationTimestamp } from '../../util/expirationTimer.std.js';
@@ -2245,7 +2250,8 @@ export function canForward(message: ReadonlyMessageAttributesType): boolean {
     !isTapToView(message) &&
     !message.deletedForEveryone &&
     !message.giftBadge &&
-    !getPayment(message)
+    !getPayment(message) &&
+    !isPoll(message)
   );
 }
 
diff --git a/ts/util/canEditMessage.dom.ts b/ts/util/canEditMessage.dom.ts
index 945b795ee2..6ed8a0f8db 100644
--- a/ts/util/canEditMessage.dom.ts
+++ b/ts/util/canEditMessage.dom.ts
@@ -4,7 +4,7 @@
 import type { ReadonlyMessageAttributesType } from '../model-types.d.ts';
 import { DAY } from './durations/index.std.js';
 import { isMoreRecentThan } from './timestamp.std.js';
-import { isOutgoing } from '../messages/helpers.std.js';
+import { isOutgoing, isPoll } from '../messages/helpers.std.js';
 import { isMessageNoteToSelf } from './isMessageNoteToSelf.dom.js';
 
 export const MESSAGE_MAX_EDIT_COUNT = 10;
@@ -16,6 +16,7 @@ export function canEditMessage(
     !message.sms &&
     !message.deletedForEveryone &&
     isOutgoing(message) &&
+    !isPoll(message) &&
     (isMoreRecentThan(message.sent_at, DAY) || isMessageNoteToSelf(message)) &&
     Boolean(message.body)
   );