diff --git a/samples/MusicStore/Models/SampleData.cs b/samples/MusicStore/Models/SampleData.cs
index dc0bf04123..959c2679f1 100644
--- a/samples/MusicStore/Models/SampleData.cs
+++ b/samples/MusicStore/Models/SampleData.cs
@@ -19,16 +19,17 @@ namespace MusicStore.Models
 
         public static async Task InitializeMusicStoreDatabaseAsync(IServiceProvider serviceProvider, bool createUsers = true)
         {
-            using (var serviceScope = serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+            using (var serviceScope = serviceProvider.CreateScope())
             {
-                var db = serviceScope.ServiceProvider.GetService<MusicStoreContext>();
+                var scopeServiceProvider = serviceScope.ServiceProvider;
+                var db = scopeServiceProvider.GetService<MusicStoreContext>();
 
                 if (await db.Database.EnsureCreatedAsync())
                 {
-                    await InsertTestData(serviceProvider);
+                    await InsertTestData(scopeServiceProvider);
                     if (createUsers)
                     {
-                        await CreateAdminUser(serviceProvider);
+                        await CreateAdminUser(scopeServiceProvider);
                     }
                 }
             }
diff --git a/samples/MusicStore/Program.cs b/samples/MusicStore/Program.cs
index 35545a070b..a1be3307d3 100644
--- a/samples/MusicStore/Program.cs
+++ b/samples/MusicStore/Program.cs
@@ -19,7 +19,10 @@ namespace MusicStore
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseConfiguration(config)
                 .UseIISIntegration()
-                .UseStartup("MusicStore");
+                .UseStartup("MusicStore")
+                .UseDefaultServiceProvider((context, options) => {
+                    options.ValidateScopes = true;
+                });
 
             if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.HttpSys", System.StringComparison.Ordinal))
             {