diff --git a/identity-server/src/EntityFramework/TokenCleanupHost.cs b/identity-server/src/EntityFramework/TokenCleanupHost.cs
index a83b24579..732b64bb0 100644
--- a/identity-server/src/EntityFramework/TokenCleanupHost.cs
+++ b/identity-server/src/EntityFramework/TokenCleanupHost.cs
@@ -122,7 +122,7 @@ async Task RemoveExpiredGrantsAsync(CancellationToken cancellationToken = defaul
     {
         try
         {
-            using (var serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+            await using (var serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateAsyncScope())
             {
                 var tokenCleanupService = serviceScope.ServiceProvider.GetRequiredService<ITokenCleanupService>();
                 await tokenCleanupService.CleanupGrantsAsync(cancellationToken);
diff --git a/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs b/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs
index 72705b48b..d335e2aa9 100644
--- a/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs
+++ b/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs
@@ -125,7 +125,7 @@ async Task RunAsync(CancellationToken cancellationToken = default)
 
         try
         {
-            using (var serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+            await using (var serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateAsyncScope())
             {
                 var logger = serviceScope.ServiceProvider.GetRequiredService<ILogger<ServerSideSessionCleanupHost>>();
                 var options = serviceScope.ServiceProvider.GetRequiredService<IdentityServerOptions>();