diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 9deddde18..a36bc7f05 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -7767,10 +7767,7 @@ psa_status_t psa_pake_setup(
         psa_jpake_computation_stage_t *computation_stage =
             &operation->computation_stage.jpake;
 
-        computation_stage->round = PSA_JPAKE_FIRST;
-        computation_stage->io_mode = PSA_JPAKE_INPUT;
-        computation_stage->inputs = 0;
-        computation_stage->outputs = 0;
+        memset(computation_stage, 0, sizeof(*computation_stage));
         computation_stage->step = PSA_PAKE_STEP_KEY_SHARE;
     } else
 #endif /* PSA_WANT_ALG_JPAKE */