diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs
index 1d9f9474..3da0aa74 100644
--- a/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs
+++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs
@@ -170,6 +170,11 @@ public class OpenIddictEntityFrameworkApplicationStore<
             foreach (var authorization in authorizations)
             {
                 context.Entry(authorization).State = EntityState.Unchanged;
+
+                foreach (var token in authorization.Tokens)
+                {
+                    context.Entry(token).State = EntityState.Unchanged;
+                }
             }
 
             foreach (var token in tokens)
diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs
index 58ac6190..5cb452fe 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs
@@ -249,6 +249,11 @@ public class OpenIddictEntityFrameworkCoreApplicationStore<
                     foreach (var authorization in authorizations)
                     {
                         context.Entry(authorization).State = EntityState.Unchanged;
+
+                        foreach (var token in authorization.Tokens)
+                        {
+                            context.Entry(token).State = EntityState.Unchanged;
+                        }
                     }
 
                     foreach (var token in tokens)