diff --git a/fido2/ctap.c b/fido2/ctap.c
index 6c43e05..daf09be 100644
--- a/fido2/ctap.c
+++ b/fido2/ctap.c
@@ -1255,6 +1255,7 @@ uint8_t ctap_get_next_assertion(CborEncoder * encoder)
     }
 
     auth_data_update_count(&getAssertionState.buf.authData);
+    memmove(getAssertionState.buf.authData.rpIdHash, cred->credential.id.rpIdHash, 32);
 
     if (cred->credential.user.id_size)
     {