diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss
index f9901788dd..ad94b3c58e 100644
--- a/res/css/views/rooms/_EventBubbleTile.pcss
+++ b/res/css/views/rooms/_EventBubbleTile.pcss
@@ -358,6 +358,11 @@ limitations under the License.
             // Keep height equal to text for shield alignment, additional 2px because of 1px padding on text
             height: calc($font-18px + 2px);
         }
+
+        .mx_MPollEndBody {
+            // Prevent the poll end body from exceeding the tile width
+            width: 100%;
+        }
     }
 
     &:not(.mx_EventTile_noBubble) .mx_EventTile_line:not(.mx_EventTile_mediaLine) {
diff --git a/src/components/views/messages/MPollEndBody.tsx b/src/components/views/messages/MPollEndBody.tsx
index d83502f581..4e104d7cef 100644
--- a/src/components/views/messages/MPollEndBody.tsx
+++ b/src/components/views/messages/MPollEndBody.tsx
@@ -108,7 +108,7 @@ export const MPollEndBody = React.forwardRef<any, IBodyProps>(({ mxEvent, ...pro
     }
 
     return (
-        <div ref={ref}>
+        <div className="mx_MPollEndBody" ref={ref}>
             <Caption>{_t("timeline|m.poll.end|ended")}</Caption>
             <MPollBody mxEvent={pollStartEvent} {...props} />
         </div>
diff --git a/test/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap b/test/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap
index bad7c2d129..ac2603d89d 100644
--- a/test/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap
+++ b/test/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap
@@ -10,7 +10,9 @@ exports[`<MPollEndBody /> when poll start event does not exist in current timeli
 
 exports[`<MPollEndBody /> when poll start event exists in current timeline renders an ended poll 1`] = `
 <div>
-  <div>
+  <div
+    class="mx_MPollEndBody"
+  >
     <span
       class="mx_Caption"
     >