diff --git a/lib/Disco.php b/lib/Disco.php
index fc8d48637ecf6c0e628a46db815a6431c7a18ba0..d7e5cc8637c2782ec9b5c67fa2964d6370cef1cf 100644
--- a/lib/Disco.php
+++ b/lib/Disco.php
@@ -100,9 +100,9 @@ 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);
                 }
+                DiscoUtils::setUpstreamRequestedAuthnContext($state);
+                State::saveState($state, self::SAML_SP_SSO);
             }
         }