diff --git a/lib/Migration/Version30000Date20240417075404.php b/lib/Migration/Version30000Date20240417075404.php
new file mode 100644
index 0000000000..8918418358
--- /dev/null
+++ b/lib/Migration/Version30000Date20240417075404.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Photos\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Migrate the photosSourceFolder user config to photosSourceFolders
+ */
+class Version30000Date20240417075404 extends SimpleMigrationStep {
+	public function __construct(
+		private IDBConnection $db,
+	) {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+		$select = $this->db->getQueryBuilder();
+		$select->select('userid')
+			->from('preferences')
+			->where($select->expr()->eq('appid', $select->expr()->literal('photos')))
+		    ->andWhere($select->expr()->eq('configkey', $select->expr()->literal('photosSourceFolders')));
+
+		// Remove old entries for users who already have the new one
+		$delete = $this->db->getQueryBuilder();
+		$delete->delete('preferences')
+			->where($delete->expr()->eq('appid', $delete->expr()->literal('photos')))
+			->andWhere($delete->expr()->eq('configkey', $delete->expr()->literal('photosSourceFolder')))
+			->andWhere($delete->expr()->in('userid', $delete->createFunction($select->getSQL())))
+			->executeStatement();
+
+		// Update remaining old entries to new ones
+		$update = $this->db->getQueryBuilder();
+		$update->update('preferences')
+			->set('configvalue', $update->func()->concat($update->expr()->literal('["'), 'configvalue', $update->expr()->literal('"]')))
+			->set('configkey', $update->expr()->literal('photosSourceFolders'))
+			->where($update->expr()->eq('appid', $update->expr()->literal('photos')))
+			->andWhere($update->expr()->eq('configkey', $update->expr()->literal('photosSourceFolder')))
+			->executeStatement();
+	}
+}
diff --git a/lib/Migration/Version3000Date20240417075404.php b/lib/Migration/Version3000Date20240417075404.php
deleted file mode 100644
index cb9abe5080..0000000000
--- a/lib/Migration/Version3000Date20240417075404.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace OCA\Photos\Migration;
-
-use Closure;
-use OCP\DB\ISchemaWrapper;
-use OCP\IDBConnection;
-use OCP\Migration\IOutput;
-use OCP\Migration\SimpleMigrationStep;
-
-/**
- * Migrate the photosSourceFolder user config to photosSourceFolders
- */
-class Version3000Date20240417075404 extends SimpleMigrationStep {
-	public function __construct(
-		private IDBConnection $db,
-	) {
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure(): ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		$query = $this->db->getQueryBuilder();
-		$query->update('preferences')
-			->set('configvalue', $query->func()->concat($query->expr()->literal('["'), 'configvalue', $query->expr()->literal('"]')))
-			->set('configkey', $query->expr()->literal('photosSourceFolders'))
-			->where($query->expr()->eq('appid', $query->expr()->literal('photos')))
-			->andWhere($query->expr()->eq('configkey', $query->expr()->literal('photosSourceFolder')))
-			->executeStatement();
-	}
-}