diff --git a/Duplicati/CommandLine/DatabaseTool/Scripts/Local/16. Remove index from remotevolume.sql b/Duplicati/CommandLine/DatabaseTool/Scripts/Local/16. Remove index from remotevolume.sql
new file mode 100644
index 000000000..e5fa5c5ce
--- /dev/null
+++ b/Duplicati/CommandLine/DatabaseTool/Scripts/Local/16. Remove index from remotevolume.sql	
@@ -0,0 +1,2 @@
+DROP INDEX IF EXISTS "RemotevolumeNameOnly";
+DROP INDEX IF EXISTS "FileLookupMetadataID";
\ No newline at end of file
diff --git a/Duplicati/Library/Main/Database/Database schema/16. Add RemoteVolume index.sql b/Duplicati/Library/Main/Database/Database schema/16. Add RemoteVolume index.sql
new file mode 100644
index 000000000..1c512a5d8
--- /dev/null
+++ b/Duplicati/Library/Main/Database/Database schema/16. Add RemoteVolume index.sql	
@@ -0,0 +1,3 @@
+CREATE UNIQUE INDEX IF NOT EXISTS "RemotevolumeNameOnly" ON "Remotevolume" ("Name");
+CREATE INDEX IF NOT EXISTS "FileLookupMetadataID" ON "FileLookup" ("MetadataID");
+UPDATE "Version" SET "Version" = 16;
\ No newline at end of file
diff --git a/Duplicati/Library/Main/Database/Database schema/Schema.sql b/Duplicati/Library/Main/Database/Database schema/Schema.sql
index 45b296a6e..c93179b10 100644
--- a/Duplicati/Library/Main/Database/Database schema/Schema.sql	
+++ b/Duplicati/Library/Main/Database/Database schema/Schema.sql	
@@ -38,6 +38,7 @@ CREATE TABLE "Remotevolume" (
 );
 
 /* Index for detecting broken states */
+CREATE UNIQUE INDEX IF NOT EXISTS "RemotevolumeNameOnly" ON "Remotevolume" ("Name");
 CREATE UNIQUE INDEX "RemotevolumeName" ON "Remotevolume" ("Name", "State");
 
 /*
@@ -113,7 +114,7 @@ CREATE TABLE "FileLookup" (
 /* Fast path based lookup, single properties are auto-indexed */
 CREATE UNIQUE INDEX "FileLookupPath" ON "FileLookup" ("PrefixID", "Path", "BlocksetID", "MetadataID");
 CREATE INDEX "nn_FileLookup_BlockMeta" ON FileLookup ("BlocksetID", "MetadataID");
-
+CREATE INDEX "FileLookupMetadataID" ON "FileLookup" ("MetadataID");
 
 
 /*
@@ -294,4 +295,4 @@ CREATE TABLE "ChangeJournalData" (
     "ConfigHash" TEXT NOT NULL  
 );
 
-INSERT INTO "Version" ("Version") VALUES (15);
+INSERT INTO "Version" ("Version") VALUES (16);