diff --git a/src/csync_journal.c b/src/csync_journal.c
index 814bc78d28..5c7da88bbf 100644
--- a/src/csync_journal.c
+++ b/src/csync_journal.c
@@ -215,7 +215,20 @@ int csync_journal_create_tables(CSYNC *ctx) {
       "PRIMARY KEY(phash)"
       ");"
       );
+  if (result == NULL) {
+    return -1;
+  }
+  c_strlist_destroy(result);
 
+  result = csync_journal_query(ctx,
+      "CREATE INDEX metadata_phash ON metadata(phash);");
+  if (result == NULL) {
+    return -1;
+  }
+  c_strlist_destroy(result);
+
+  result = csync_journal_query(ctx,
+      "CREATE INDEX metadata_inode ON metadata(inode);");
   if (result == NULL) {
     return -1;
   }