diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionMiddleware.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionMiddleware.cs
index b40c8badbd..c9444bec3c 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionMiddleware.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web.SessionState;
 using Microsoft.AspNetCore.Http;
@@ -22,6 +23,8 @@ internal partial class SessionMiddleware
     [LoggerMessage(EventId = 1, Level = LogLevel.Warning, Message = "Creating session on demand by synchronously waiting on a potential asynchronous connection")]
     private partial void LogOnDemand();
 
+    private readonly TimeSpan CommitTimeout = TimeSpan.FromMinutes(1);
+
     public SessionMiddleware(RequestDelegate next, ILogger<SessionMiddleware> logger)
     {
         _next = next;
@@ -56,7 +59,9 @@ private async Task ManageStateAsync(HttpContextCore context, SessionAttribute me
         try
         {
             await _next(context);
-            await state.CommitAsync(context.RequestAborted);
+
+            using var cts = new CancellationTokenSource(CommitTimeout);
+            await state.CommitAsync(cts.Token);
         }
         finally
         {