diff --git a/appinfo/info.xml b/appinfo/info.xml
index 6c5af2463745..260cb01f7d60 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -18,7 +18,7 @@
 * 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.
 ]]></description>
 
-	<version>20.0.0-dev.5</version>
+	<version>20.0.0-dev.6</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
diff --git a/lib/Migration/Version20000Date20240717180417.php b/lib/Migration/Version20000Date20240717180417.php
new file mode 100644
index 000000000000..30f29c5d7a4a
--- /dev/null
+++ b/lib/Migration/Version20000Date20240717180417.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version20000Date20240717180417 extends SimpleMigrationStep {
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		// Remove redundant index ta_room from talk_attendees
+		$table = $schema->getTable('talk_attendees');
+		if ($table->hasIndex('ta_room')) {
+			$table->dropIndex('ta_room');
+		}
+
+		// Remove redundant index talk_bots_convo_id from talk_bots_conversation
+		$table = $schema->getTable('talk_bots_conversation');
+		if ($table->hasIndex('talk_bots_convo_id')) {
+			$table->dropIndex('talk_bots_convo_id');
+		}
+
+		return $schema;
+	}
+}