diff --git a/src/MusicStore.Spa/Models/SampleData.cs b/src/MusicStore.Spa/Models/SampleData.cs
index 1ed84c084b..33e7219a06 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).State = existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item)))
+                    db.Entry(item).SetState(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 5db5f59299..1f9b91bb57 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).State = EntityState.Modified;
+                _db.Entry(cartItem).SetState(EntityState.Modified);
             }
         }
 
@@ -75,7 +75,7 @@ namespace MusicStore.Models
                     cartItem.Count--;
 
                     // TODO [EF] Remove this line once change detection is available
-                    _db.Entry(cartItem).State = EntityState.Modified;
+                    _db.Entry(cartItem).SetState(EntityState.Modified);
 
                     itemCount = cartItem.Count;
                 }
@@ -95,7 +95,7 @@ namespace MusicStore.Models
             foreach (var cartItem in cartItems)
             {
                 // TODO [EF] Change to DbSet.Remove once querying attaches instances
-                _db.Entry(cartItem).State = EntityState.Deleted;
+                _db.Entry(cartItem).SetState(EntityState.Deleted);
             }
         }
 
diff --git a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
index 7780b6da93..e49d345a5e 100644
--- a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
+++ b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
@@ -138,7 +138,7 @@ namespace MusicStore.Areas.Admin.Controllers
         {
             if (ModelState.IsValid)
             {
-                db.Entry(album).State = EntityState.Modified;
+                db.Entry(album).SetState(EntityState.Modified);
                 await db.SaveChangesAsync(Context.RequestAborted);
                 //Invalidate the cache entry as it is modified
                 cache.Remove(string.Format("album_{0}", album.AlbumId));
diff --git a/src/MusicStore/Models/SampleData.cs b/src/MusicStore/Models/SampleData.cs
index 625b7a10bc..9adee1c328 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).State = existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item)))
+                    db.Entry(item).SetState(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 8b78c462a0..79c3ed31d2 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).State = EntityState.Modified;
+                _storeContext.Entry(album).SetState(EntityState.Modified);
                 
                 await _storeContext.SaveChangesAsync();
                 
diff --git a/src/MvcMusicStore/Controllers/StoreManagerController.cs b/src/MvcMusicStore/Controllers/StoreManagerController.cs
index e14f9b45a3..1c4bca4c2a 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).State = EntityState.Modified;
+                _storeContext.Entry(album).SetState(EntityState.Modified);
                 
                 await _storeContext.SaveChangesAsync();