diff --git a/include/psa/crypto_extra.h b/include/psa/crypto_extra.h
index 2d6b6abd1..8b8cb042e 100644
--- a/include/psa/crypto_extra.h
+++ b/include/psa/crypto_extra.h
@@ -1895,7 +1895,7 @@ psa_status_t psa_pake_abort(psa_pake_operation_t *operation);
  * psa_pake_operation_t.
  */
 #define PSA_PAKE_OPERATION_INIT { 0, PSA_ALG_NONE, PSA_PAKE_OPERATION_STAGE_SETUP, \
-                                  { { 0 } }, { { 0 } } }
+                                  { { 0, 0, 0, 0 } }, { { 0 } } }
 
 struct psa_pake_cipher_suite_s {
     psa_algorithm_t algorithm;
@@ -2045,8 +2045,8 @@ struct psa_pake_operation_s {
         psa_jpake_computation_stage_t MBEDTLS_PRIVATE(jpake);
     } MBEDTLS_PRIVATE(computation_stage);
     union {
-        psa_crypto_driver_pake_inputs_t MBEDTLS_PRIVATE(inputs);
         psa_driver_pake_context_t MBEDTLS_PRIVATE(ctx);
+        psa_crypto_driver_pake_inputs_t MBEDTLS_PRIVATE(inputs);
     } MBEDTLS_PRIVATE(data);
 };