diff --git a/src/MusicStore.Spa/Models/MusicStoreContext.cs b/src/MusicStore.Spa/Models/MusicStoreContext.cs
index ea573017df..4fd9968a17 100644
--- a/src/MusicStore.Spa/Models/MusicStoreContext.cs
+++ b/src/MusicStore.Spa/Models/MusicStoreContext.cs
@@ -47,6 +47,11 @@ namespace MusicStore.Models
             builder.Entity<CartItem>().Key(ci => ci.CartItemId);
             builder.Entity<OrderDetail>().Key(od => od.OrderDetailId);
 
+            // TODO: Remove this when we start using auto generated values
+            builder.Entity<Artist>().Property(a => a.ArtistId).GenerateValuesOnAdd(generateValues: false);
+            builder.Entity<Album>().Property(a => a.ArtistId).GenerateValuesOnAdd(generateValues: false);
+            builder.Entity<Genre>().Property(g => g.GenreId).GenerateValuesOnAdd(generateValues: false);
+
             builder.Entity<Album>(b =>
                 {
                     b.ForeignKey<Genre>(a => a.GenreId);
diff --git a/src/MusicStore.Spa/Models/SampleData.cs b/src/MusicStore.Spa/Models/SampleData.cs
index 6c845ba701..6e250eb504 100644
--- a/src/MusicStore.Spa/Models/SampleData.cs
+++ b/src/MusicStore.Spa/Models/SampleData.cs
@@ -579,11 +579,8 @@ namespace MusicStore.Models
                 new Album { Title = "Zoso", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl },
             };
 
-            // TODO [EF] Swap to store generated keys when available
-            int albumId = 1;
             foreach (var album in albums)
             {
-                album.AlbumId = albumId++;
                 album.ArtistId = album.Artist.ArtistId;
                 album.GenreId = album.Genre.GenreId;
             }