diff --git a/src/MusicStore.Spa/Models/SampleData.cs b/src/MusicStore.Spa/Models/SampleData.cs
index 33e7219a06..1ed84c084b 100644
--- a/src/MusicStore.Spa/Models/SampleData.cs
+++ b/src/MusicStore.Spa/Models/SampleData.cs
@@ -86,9 +86,9 @@ namespace MusicStore.Models
             {
                 foreach (var item in entities)
                 {
-                    db.Entry(item).SetState(existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item)))
+                    db.Entry(item).State = existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item)))
                         ? EntityState.Modified
-                        : EntityState.Added);
+                        : EntityState.Added;
                 }
 
                 await db.SaveChangesAsync();
diff --git a/src/MusicStore.Spa/Models/ShoppingCart.cs b/src/MusicStore.Spa/Models/ShoppingCart.cs
index 1f9b91bb57..4e0a0ac7ed 100644
--- a/src/MusicStore.Spa/Models/ShoppingCart.cs
+++ b/src/MusicStore.Spa/Models/ShoppingCart.cs
@@ -55,7 +55,7 @@ namespace MusicStore.Models
                 cartItem.Count++;
 
                 // TODO [EF] Remove this line once change detection is available
-                _db.Entry(cartItem).SetState(EntityState.Modified);
+                _db.Update(cartItem);
             }
         }
 
@@ -75,7 +75,7 @@ namespace MusicStore.Models
                     cartItem.Count--;
 
                     // TODO [EF] Remove this line once change detection is available
-                    _db.Entry(cartItem).SetState(EntityState.Modified);
+                    _db.Update(cartItem);
 
                     itemCount = cartItem.Count;
                 }
@@ -94,8 +94,7 @@ namespace MusicStore.Models
 
             foreach (var cartItem in cartItems)
             {
-                // TODO [EF] Change to DbSet.Remove once querying attaches instances
-                _db.Entry(cartItem).SetState(EntityState.Deleted);
+                _db.Remove(cartItem);
             }
         }
 
diff --git a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
index f550f04383..672641cc35 100644
--- a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
+++ b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
@@ -134,7 +134,7 @@ namespace MusicStore.Areas.Admin.Controllers
         {
             if (ModelState.IsValid)
             {
-                _dbContext.Entry(album).SetState(EntityState.Modified);
+                _dbContext.Update(album);
                 await _dbContext.SaveChangesAsync(Context.RequestAborted);
                 //Invalidate the cache entry as it is modified
                 _cache.Remove(GetCacheKey(album.AlbumId));
diff --git a/src/MusicStore/Models/SampleData.cs b/src/MusicStore/Models/SampleData.cs
index a7d43f1f1c..f05e67a993 100644
--- a/src/MusicStore/Models/SampleData.cs
+++ b/src/MusicStore/Models/SampleData.cs
@@ -70,9 +70,9 @@ namespace MusicStore.Models
             {
                 foreach (var item in entities)
                 {
-                    db.Entry(item).SetState(existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item)))
+                    db.Entry(item).State = existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item)))
                         ? EntityState.Modified
-                        : EntityState.Added);
+                        : EntityState.Added;
                 }
 
                 await db.SaveChangesAsync();
diff --git a/src/MvcMusicStore.Spa/Controllers/StoreManagerController.cs b/src/MvcMusicStore.Spa/Controllers/StoreManagerController.cs
index 79c3ed31d2..61044d2b65 100644
--- a/src/MvcMusicStore.Spa/Controllers/StoreManagerController.cs
+++ b/src/MvcMusicStore.Spa/Controllers/StoreManagerController.cs
@@ -56,7 +56,7 @@ namespace MvcMusicStore.Controllers
         {
             if (ModelState.IsValid)
             {
-                _storeContext.Entry(album).SetState(EntityState.Modified);
+                _storeContext.Update(album);
                 
                 await _storeContext.SaveChangesAsync();
                 
diff --git a/src/MvcMusicStore/Controllers/StoreManagerController.cs b/src/MvcMusicStore/Controllers/StoreManagerController.cs
index 1c4bca4c2a..91aa10cf06 100644
--- a/src/MvcMusicStore/Controllers/StoreManagerController.cs
+++ b/src/MvcMusicStore/Controllers/StoreManagerController.cs
@@ -73,7 +73,7 @@ namespace MvcMusicStore.Controllers
         {
             if (ModelState.IsValid)
             {
-                _storeContext.Entry(album).SetState(EntityState.Modified);
+                _storeContext.Update(album);
                 
                 await _storeContext.SaveChangesAsync();