diff --git a/Utils/SQLiteStore.m b/Utils/SQLiteStore.m
index da60b375b..68377577a 100644
--- a/Utils/SQLiteStore.m
+++ b/Utils/SQLiteStore.m
@@ -1293,19 +1293,8 @@ static SQLiteStore *g_sharedStore = NULL;
 
             return;
         }
-        
-        // Now to replace the playlist entries
-        for (size_t i = 0; i < [databaseMirror count]; ++i)
-        {
-            PlaylistEntry *oldpe = [databaseMirror objectAtIndex:i];
-            if ([oldpe dbIndex] == trackId)
-            {
-                PlaylistEntry *newpe = [track mutableCopy];
-                [newpe setIndex:i];
-                [newpe setEntryId:[oldpe entryId]];
-                [databaseMirror replaceObjectAtIndex:i withObject:newpe];
-            }
-        }
+
+        [databaseMirror replaceObjectAtIndex:[track index] withObject:track];
     }
 }