diff --git a/src/MusicStore/Models/SampleData.cs b/src/MusicStore/Models/SampleData.cs
index 14bb4f0414..f432297346 100644
--- a/src/MusicStore/Models/SampleData.cs
+++ b/src/MusicStore/Models/SampleData.cs
@@ -36,9 +36,15 @@ namespace MusicStore.Web.Models
         private static void AddOrUpdate<TEntity>(Func<TEntity, object> propertyToMatch, IEnumerable<TEntity> entities)
             where TEntity : class
         {
+            // Query in a separate context so that we can attach existing entities as modified
+            List<TEntity> existingData;
+            using (var db = new MusicStoreContext())
+            {
+                existingData = db.Set<TEntity>().ToList();
+            }
+
             using (var db = new MusicStoreContext())
             {
-                var existingData = db.Set<TEntity>().ToList();
                 foreach (var item in entities)
                 {
                     db.ChangeTracker.Entry(item).State = existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item)))