diff --git a/lib/Chat/ChatManager.php b/lib/Chat/ChatManager.php
index 3b0b42fff45..370f2506882 100644
--- a/lib/Chat/ChatManager.php
+++ b/lib/Chat/ChatManager.php
@@ -459,6 +459,8 @@ public function clearHistory(Room $chat, string $actorType, string $actorId): IC
 
 		$this->participantService->resetChatDetails($chat);
 
+		$this->pollService->deleteByRoomId($chat->getId());
+
 		return $this->addSystemMessage(
 			$chat,
 			$actorType,
diff --git a/tests/integration/features/chat-2/poll.feature b/tests/integration/features/chat-2/poll.feature
index ba78cbb00ae..7389cd5686f 100644
--- a/tests/integration/features/chat-2/poll.feature
+++ b/tests/integration/features/chat-2/poll.feature
@@ -715,3 +715,21 @@ Feature: chat-2/poll
       | room | actorType | actorId      | actorDisplayName         | message                | messageParameters |
       | room | users     | participant2 | participant2-displayname | Message deleted by you | "IGNORE"          |
       | room | users     | participant2 | participant2-displayname | Message deleted by you | "IGNORE"          |
+
+  Scenario: Deleting the chat history also deletes polls
+    Given user "participant1" creates room "room" (v4)
+      | roomType | 2 |
+      | roomName | room |
+    And user "participant1" adds user "participant2" to room "room" with 200 (v4)
+    And user "participant2" creates a poll in room "room" with 201
+      | question   | What is the question? |
+      | options    | ["Where are you?","How much is the fish?"] |
+      | resultMode | public |
+      | maxVotes   | unlimited |
+    And user "participant1" sees the following messages in room "room" with 200 (v1)
+      | room | actorType | actorId      | actorDisplayName         | message  | messageParameters |
+      | room | users     | participant2 | participant2-displayname | {object} | "IGNORE"          |
+    And user "participant1" deletes chat history for room "room" with 200
+    Then user "participant1" sees poll "What is the question?" in room "room" with 404
+    Then user "participant2" sees poll "What is the question?" in room "room" with 404
+    And user "participant1" sees the following messages in room "room" with 200 (v1)