diff --git a/src/Microsoft.AspNetCore.Identity.Service/SessionManager.cs b/src/Microsoft.AspNetCore.Identity.Service/SessionManager.cs
index c83f9df2c0..7b302d3cc7 100644
--- a/src/Microsoft.AspNetCore.Identity.Service/SessionManager.cs
+++ b/src/Microsoft.AspNetCore.Identity.Service/SessionManager.cs
@@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Identity.Service
                 var clientId = application.FindFirstValue(IdentityServiceClaimTypes.ClientId);
                 var logoutUris = application.FindAll(IdentityServiceClaimTypes.LogoutRedirectUri);
 
-                var duration = _sessionCookieOptions.Cookie.Expiration ?? default(TimeSpan);
+                var duration = _sessionCookieOptions.ExpireTimeSpan;
                 var expiration = _timeStampManager.GetTimeStampInEpochTime(duration);
 
                 var identity = new ClaimsIdentity(
diff --git a/src/Microsoft.AspNetCore.Identity/IdentityServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Identity/IdentityServiceCollectionExtensions.cs
index 61c6048d10..acd9114505 100644
--- a/src/Microsoft.AspNetCore.Identity/IdentityServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.Identity/IdentityServiceCollectionExtensions.cs
@@ -80,14 +80,14 @@ namespace Microsoft.Extensions.DependencyInjection
 			.AddCookie(IdentityConstants.ExternalScheme, o =>
             {
                 o.Cookie.Name = IdentityConstants.ExternalScheme;
-                o.Cookie.Expiration = TimeSpan.FromMinutes(5);
+                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
             })
 			.AddCookie(IdentityConstants.TwoFactorRememberMeScheme,
                 o => o.Cookie.Name = IdentityConstants.TwoFactorRememberMeScheme)
             .AddCookie(IdentityConstants.TwoFactorUserIdScheme, o =>
             {
                 o.Cookie.Name = IdentityConstants.TwoFactorUserIdScheme;
-                o.Cookie.Expiration = TimeSpan.FromMinutes(5);
+                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
             });
 
             // Hosting doesn't add IHttpContextAccessor by default
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/FunctionalTest.cs b/test/Microsoft.AspNetCore.Identity.InMemory.Test/FunctionalTest.cs
index af00e6e0fe..d98020a10d 100644
--- a/test/Microsoft.AspNetCore.Identity.InMemory.Test/FunctionalTest.cs
+++ b/test/Microsoft.AspNetCore.Identity.InMemory.Test/FunctionalTest.cs
@@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Identity.InMemory
             {
                 services.ConfigureApplicationCookie(options =>
                 {
-                    options.Cookie.Expiration = TimeSpan.FromMinutes(10);
+                    options.ExpireTimeSpan = TimeSpan.FromMinutes(10);
                     options.SlidingExpiration = false;
                 });
                 services.AddSingleton<ISystemClock>(clock);