diff --git a/library/psa_crypto_pake.c b/library/psa_crypto_pake.c
index d9b2ecd..4136614 100644
--- a/library/psa_crypto_pake.c
+++ b/library/psa_crypto_pake.c
@@ -289,9 +289,6 @@
             goto error;
         }
 
-        /* Role has been set, release user/peer buffers. */
-        mbedtls_free(user); mbedtls_free(peer);
-
         operation->buffer_length = 0;
         operation->buffer_offset = 0;
 
@@ -300,6 +297,9 @@
             goto error;
         }
 
+        /* Role has been set, release user/peer buffers. */
+        mbedtls_free(user); mbedtls_free(peer);
+
         return PSA_SUCCESS;
     } else
 #else