diff --git a/app/dashboard/views/fido_setup.py b/app/dashboard/views/fido_setup.py
index 5f7283b2..5cdf6c37 100644
--- a/app/dashboard/views/fido_setup.py
+++ b/app/dashboard/views/fido_setup.py
@@ -69,6 +69,7 @@ def fido_setup():
 
         if current_user.fido_uuid is None:
             current_user.fido_uuid = fido_uuid
+            db.session.flush()
 
         Fido.create(
             credential_id=str(fido_credential.credential_id, "utf-8"),