diff --git a/Utils/SQLiteStore.m b/Utils/SQLiteStore.m
index 04bc0bafe..888980bca 100644
--- a/Utils/SQLiteStore.m
+++ b/Utils/SQLiteStore.m
@@ -1254,11 +1254,16 @@ static SQLiteStore *g_sharedStore = NULL;
         return;
     }
     
-    if (trackId != [track dbIndex])
+    if (trackId != [track dbIndex] && [track dbIndex] != 0)
     {
         [self removeString:urlId];
         return;
     }
+    
+    if ([track dbIndex] == 0)
+    {
+        [track setDbIndex:trackId];
+    }
 
     st = stmt[stmt_select_track_data];