diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2961105439d..6c5af246374 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.4</version>
+	<version>20.0.0-dev.5</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
@@ -31,6 +31,7 @@
 	<author>Marcel Hibbe</author>
 	<author>Marcel Müller</author>
 	<author>Sowjanya Kota</author>
+	<author>Shankar Kalidindi</author>
 
 	<namespace>Talk</namespace>
 
diff --git a/lib/Migration/Version18000Date20231024141627.php b/lib/Migration/Version18000Date20231024141627.php
index d4b70a6072f..7e5bf2aa8e0 100644
--- a/lib/Migration/Version18000Date20231024141627.php
+++ b/lib/Migration/Version18000Date20231024141627.php
@@ -68,7 +68,6 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 			$table->addIndex(['local_room_id'], 'talk_fedinv_lri');
 			$table->addUniqueIndex(['remote_server_url', 'remote_attendee_id'], 'talk_fedinv_remote');
-
 			return $schema;
 		}
 		return null;
diff --git a/lib/Migration/Version20000Date20240716190335.php b/lib/Migration/Version20000Date20240716190335.php
new file mode 100644
index 00000000000..82fbc302fc8
--- /dev/null
+++ b/lib/Migration/Version20000Date20240716190335.php
@@ -0,0 +1,36 @@
+<?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 Version20000Date20240716190335 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();
+
+		$table = $schema->getTable('talk_invitations');
+		if (!$table->hasIndex('talk_user_state')) {
+			$table->addIndex(['user_id', 'state'], 'talk_user_state');
+			return $schema;
+		}
+
+		return null;
+	}
+}