diff --git a/lib/Disco.php b/lib/Disco.php
index 0556729772101bb72259844b51d4e507d4afdca9..fc8d48637ecf6c0e628a46db815a6431c7a18ba0 100644
--- a/lib/Disco.php
+++ b/lib/Disco.php
@@ -7,6 +7,7 @@ namespace SimpleSAML\Module\elixir;
 use SimpleSAML\Auth\State;
 use SimpleSAML\Configuration;
 use SimpleSAML\Logger;
+use SimpleSAML\Module\authswitcher\DiscoUtils;
 use SimpleSAML\Module\discopower\PowerIdPDisco;
 use SimpleSAML\Module\elixir\discowarning\WarningConfiguration;
 use SimpleSAML\Utils\HTTP;
@@ -99,6 +100,7 @@ class Disco extends PowerIdPDisco
                     $this->originalAuthnContextClassRef =
                         $state[self::SAML_REQUESTED_AUTHN_CONTEXT][self::AUTHN_CONTEXT_CLASS_REF];
                     $this->removeAuthContextClassRefWithPrefixes($state);
+                    DiscoUtils::setUpstreamRequestedAuthnContext($state);
                     State::saveState($state, self::SAML_SP_SSO);
                 }
             }