diff --git a/shared/Mocks/StartupOpenIdConnectTesting.cs b/shared/Mocks/StartupOpenIdConnectTesting.cs
index 602862817b..06a79c5698 100644
--- a/shared/Mocks/StartupOpenIdConnectTesting.cs
+++ b/shared/Mocks/StartupOpenIdConnectTesting.cs
@@ -11,6 +11,7 @@ using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using MusicStore.Components;
 using MusicStore.Mocks.Common;
 using MusicStore.Mocks.OpenIdConnect;
@@ -124,6 +125,7 @@ namespace MusicStore
                 BackchannelHttpHandler = new OpenIdConnectBackChannelHttpHandler(),
                 StringDataFormat = new CustomStringDataFormat(),
                 StateDataFormat = new CustomStateDataFormat(),
+                ResponseType = OpenIdConnectResponseTypes.CodeIdToken,
                 UseTokenLifetime = false,
 
                 Events = new OpenIdConnectEvents
diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs
index 5c1c4a293d..8ef90ef485 100644
--- a/src/MusicStore/StartupOpenIdConnect.cs
+++ b/src/MusicStore/StartupOpenIdConnect.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.PlatformAbstractions;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using MusicStore.Components;
 using MusicStore.Models;
 
@@ -133,7 +134,8 @@ namespace MusicStore
             app.UseOpenIdConnectAuthentication(new OpenIdConnectOptions
             {
                 Authority = "https://login.windows.net/[tenantName].onmicrosoft.com",
-                ClientId = "[ClientId]"
+                ClientId = "[ClientId]",
+                ResponseType = OpenIdConnectResponseTypes.CodeIdToken,
             });
 
             // Add MVC to the request pipeline