diff --git a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
index afff7ad106..ec77780b83 100644
--- a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
+++ b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
@@ -503,8 +503,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
         {
             cancellationToken.ThrowIfCancellationRequested();
             ThrowIfDisposed();
-            // TODO: Fix once EF query works Issue #10668
-            return Task.FromResult(Users.Where(u => u.NormalizedEmail == normalizedEmail).ToList().SingleOrDefault());
+
+            return Task.FromResult(Users.Where(u => u.NormalizedEmail == normalizedEmail).SingleOrDefault());
         }
 
         /// <summary>
diff --git a/src/Identity/EntityFrameworkCore/src/UserStore.cs b/src/Identity/EntityFrameworkCore/src/UserStore.cs
index 62f6fe5271..4709916a12 100644
--- a/src/Identity/EntityFrameworkCore/src/UserStore.cs
+++ b/src/Identity/EntityFrameworkCore/src/UserStore.cs
@@ -636,8 +636,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
         {
             cancellationToken.ThrowIfCancellationRequested();
             ThrowIfDisposed();
-            // TODO: Fix once EF query works Issue #10668
-            return Task.FromResult(Users.Where(u => u.NormalizedEmail == normalizedEmail).ToList().SingleOrDefault());
+
+            return Task.FromResult(Users.Where(u => u.NormalizedEmail == normalizedEmail).SingleOrDefault());
         }
 
         /// <summary>
diff --git a/src/MusicStore/samples/MusicStore/Controllers/StoreController.cs b/src/MusicStore/samples/MusicStore/Controllers/StoreController.cs
index 718ce85b76..91b4ca2b0a 100644
--- a/src/MusicStore/samples/MusicStore/Controllers/StoreController.cs
+++ b/src/MusicStore/samples/MusicStore/Controllers/StoreController.cs
@@ -36,6 +36,7 @@ namespace MusicStore.Controllers
         {
             // Retrieve Genre genre and its Associated associated Albums albums from database
             var genreModel = await DbContext.Genres
+                .Include(g => g.Albums)	
                 .Where(g => g.Name == genre)
                 .FirstOrDefaultAsync();
 
@@ -44,8 +45,6 @@ namespace MusicStore.Controllers
                 return NotFound();
             }
 
-            await DbContext.Entry(genreModel).Collection(g => g.Albums).LoadAsync();
-
             return View(genreModel);
         }
 
diff --git a/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs b/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs
index 3f159adb1d..5b2e3a26d3 100644
--- a/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs
+++ b/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs
@@ -121,6 +121,7 @@ namespace MusicStore.Models
             // the current price for each of those albums in the cart
             // sum all album price totals to get the cart total
 
+            // No way to do decimal sum on server with SQLite, but client eval is fine here
             return (await _dbContext
                 .CartItems
                 .Where(c => c.CartId == _shoppingCartId)