diff --git a/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java b/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
index 9886ebfdf..dada626b5 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
@@ -80,8 +80,8 @@ final class ContentProviderMigrator {
                 }
                 // add new repo if not existing
                 if (repo == null) { // new repo to be added to new DB
-                    InitialRepository newRepo = new InitialRepository(
-                            name, address, Arrays.asList(new String[]{}), "", certificate, 0, enabled, ++weight);
+                    InitialRepository newRepo = new InitialRepository(name, address, "", certificate,
+                            0, enabled, ++weight);
                     long repoId = repoDao.insert(newRepo);
                     repo = ObjectsCompat.requireNonNull(repoDao.getRepository(repoId));
                 } else { // old repo that may need an update for the new DB
diff --git a/libs/database/src/dbTest/java/org/fdroid/database/RepositoryDaoTest.kt b/libs/database/src/dbTest/java/org/fdroid/database/RepositoryDaoTest.kt
index 0a818ff49..4c150d062 100644
--- a/libs/database/src/dbTest/java/org/fdroid/database/RepositoryDaoTest.kt
+++ b/libs/database/src/dbTest/java/org/fdroid/database/RepositoryDaoTest.kt
@@ -51,14 +51,7 @@ internal class RepositoryDaoTest : DbTest() {
         assertEquals(3, actualRepo.mirrors.size)
         assertEquals(emptyList(), actualRepo.userMirrors)
         assertEquals(emptyList(), actualRepo.disabledMirrors)
-        assertEquals(
-            listOf(
-                org.fdroid.download.Mirror(repo.address),
-                org.fdroid.download.Mirror(repo.mirrors[0]),
-                org.fdroid.download.Mirror(repo.mirrors[1]),
-                org.fdroid.download.Mirror(repo.mirrors[2]),
-            ).toSet(), actualRepo.getAllMirrors().toSet()
-        )
+        assertEquals(repo.mirrors.toSet(), actualRepo.mirrors.map { it.url }.toSet())
         assertEquals(emptyList(), actualRepo.antiFeatures)
         assertEquals(emptyList(), actualRepo.categories)
         assertEquals(emptyList(), actualRepo.releaseChannels)
diff --git a/libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt b/libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt
index d5106a8c6..a85559624 100644
--- a/libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt
+++ b/libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt
@@ -140,7 +140,7 @@ internal interface RepositoryDaoInt : RepositoryDao {
             enabled = initialRepo.enabled,
         )
         insert(repositoryPreferences)
-        insertMirrors(initialRepo.mirrors.map { it -> Mirror(repoId, it, null) })
+        insertMirrors(initialRepo.mirrors.map { url -> Mirror(repoId, url, null) })
         return repoId
     }