diff --git a/lib/private/AppFramework/Middleware/FlowV2EphemeralSessionsMiddleware.php b/lib/private/AppFramework/Middleware/FlowV2EphemeralSessionsMiddleware.php
index 5d9170c4a6d63..eb30c4dd1cfa3 100644
--- a/lib/private/AppFramework/Middleware/FlowV2EphemeralSessionsMiddleware.php
+++ b/lib/private/AppFramework/Middleware/FlowV2EphemeralSessionsMiddleware.php
@@ -9,6 +9,7 @@
 
 use OC\AppFramework\Utility\ControllerMethodReflector;
 use OC\Core\Controller\ClientFlowLoginV2Controller;
+use OC\Core\Controller\TwoFactorChallengeController;
 use OCP\AppFramework\Middleware;
 use OCP\ISession;
 use OCP\IUserSession;
@@ -42,6 +43,10 @@ public function beforeController($controller, $methodName) {
 			return;
 		}
 
+		if ($controller instanceof TwoFactorChallengeController) {
+			return;
+		}
+
 		if ($this->reflector->hasAnnotation('PublicPage')) {
 			return;
 		}