diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php
index 9dfae845d98..d538a3f685c 100644
--- a/lib/Service/RoomService.php
+++ b/lib/Service/RoomService.php
@@ -921,6 +921,14 @@ public function deleteRoom(Room $room): void {
 			}
 		}
 
+		if ($room->isFederatedConversation()) {
+			// Delete PCM messages
+			$delete = $this->db->getQueryBuilder();
+			$delete->delete('talk_proxy_messages')
+				->where($delete->expr()->eq('local_token', $delete->createNamedParameter($room->getToken())));
+			$delete->executeStatement();
+		}
+
 		// Delete attendees
 		$delete = $this->db->getQueryBuilder();
 		$delete->delete('talk_attendees')