diff --git a/library/psa_crypto_pake.c b/library/psa_crypto_pake.c
index 7f147b7cca..48995dd0d1 100644
--- a/library/psa_crypto_pake.c
+++ b/library/psa_crypto_pake.c
@@ -702,10 +702,6 @@ psa_status_t psa_pake_abort(psa_pake_operation_t * operation)
         return( PSA_SUCCESS );
     }
 
-    operation->alg = 0;
-    operation->state = 0;
-    operation->sequence = 0;
-
 #if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
     if( operation->alg == PSA_ALG_JPAKE )
     {
@@ -721,6 +717,10 @@ psa_status_t psa_pake_abort(psa_pake_operation_t * operation)
     }
 #endif
 
+    operation->alg = 0;
+    operation->state = 0;
+    operation->sequence = 0;
+
     return( PSA_SUCCESS );
 }