diff --git a/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx b/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx
index 2307f534..2302090b 100644
--- a/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx
+++ b/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx
@@ -88,10 +88,16 @@ export const MFAModal = () => {
     setStartResponse(undefined);
   };
 
-  const resetAuthState = () => {
+  const resetAuthState = useCallback(() => {
     setScreen('start');
     setStartResponse(undefined);
-  };
+  }, []);
+
+  useEffect(() => {
+    if (location) {
+      resetAuthState();
+    }
+  }, [location, resetAuthState]);
 
   // selectedMethod: 0 = authenticator app, 1 = email, 2 = OpenID, 3 = MobileApprove
   const startMFA = useCallback(