diff --git a/app/Actions/Passkeys/GeneratePasskeyAuthenticationOptionsAction.php b/app/Actions/Passkeys/GeneratePasskeyAuthenticationOptionsAction.php
index 9b0689784..cc5fb66fe 100644
--- a/app/Actions/Passkeys/GeneratePasskeyAuthenticationOptionsAction.php
+++ b/app/Actions/Passkeys/GeneratePasskeyAuthenticationOptionsAction.php
@@ -25,7 +25,7 @@ final class GeneratePasskeyAuthenticationOptionsAction extends BaseGeneratePassk
 
         $options = Serializer::make()->toJson($options);
 
-        Session::flash('passkey-authentication-options', $options);
+        Session::put('passkey-authentication-options', $options);
 
         return $options;
     }
diff --git a/app/Http/Controllers/Auth/PasskeyLoginController.php b/app/Http/Controllers/Auth/PasskeyLoginController.php
index bb3715937..91f5b86b1 100644
--- a/app/Http/Controllers/Auth/PasskeyLoginController.php
+++ b/app/Http/Controllers/Auth/PasskeyLoginController.php
@@ -44,7 +44,7 @@ final class PasskeyLoginController extends Controller
             }
         }
 
-        $passkeyOptionsJson = Session::get('passkey-authentication-options');
+        $passkeyOptionsJson = Session::pull('passkey-authentication-options');
 
         if (! is_string($passkeyOptionsJson) || $passkeyOptionsJson === '') {
             Log::channel('failed_login')->warning(
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index fbc66fe18..dc30586d1 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -43,7 +43,9 @@
                 @endif
 
                 <div x-show="!showPassword" x-cloak>
-                    @include('partials.passkey-authenticate', ['autoPromptPasskey' => ! $errors->any()])
+                    @include('partials.passkey-authenticate', [
+                        'autoPromptPasskey' => ! $errors->any() && ! session()->has('authenticatePasskey::message'),
+                    ])
 
                     <button
                         type="button"