diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs
index 16e83ba2..f290f577 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs
@@ -748,7 +748,7 @@ namespace OpenIddict.EntityFrameworkCore
         public virtual async Task<ImmutableArray<TApplication>> ListAsync(
             [CanBeNull] int? count, [CanBeNull] int? offset, CancellationToken cancellationToken)
         {
-            var query = Applications.OrderBy(application => application.Id).AsQueryable();
+            var query = Applications.OrderBy(application => application.Id).AsTracking();
 
             if (offset.HasValue)
             {
diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs
index 454fd10a..fda4772b 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs
@@ -738,7 +738,7 @@ namespace OpenIddict.EntityFrameworkCore
         {
             var query = Authorizations.Include(authorization => authorization.Application)
                                       .OrderBy(authorization => authorization.Id)
-                                      .AsQueryable();
+                                      .AsTracking();
 
             if (offset.HasValue)
             {
diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs
index 4d49c6e1..12a78c93 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs
@@ -510,7 +510,7 @@ namespace OpenIddict.EntityFrameworkCore
         public virtual async Task<ImmutableArray<TScope>> ListAsync(
             [CanBeNull] int? count, [CanBeNull] int? offset, CancellationToken cancellationToken)
         {
-            var query = Scopes.OrderBy(scope => scope.Id).AsQueryable();
+            var query = Scopes.OrderBy(scope => scope.Id).AsTracking();
 
             if (offset.HasValue)
             {
diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs
index 5148a370..dbe401a0 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs
@@ -852,7 +852,7 @@ namespace OpenIddict.EntityFrameworkCore
             var query = Tokens.Include(token => token.Application)
                               .Include(token => token.Authorization)
                               .OrderBy(token => token.Id)
-                              .AsQueryable();
+                              .AsTracking();
 
             if (offset.HasValue)
             {