diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index daa34ffa34..d3a2865ab7 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3893,11 +3893,9 @@ psa_status_t psa_aead_generate_nonce( psa_aead_operation_t *operation,
         goto exit;
     }
 
-    if( required_nonce_size > sizeof( local_nonce ) )
-    {
-        status = PSA_ERROR_GENERIC_ERROR;
-        goto exit;
-    }
+#if defined(assert)
+    assert( required_nonce_size <= sizeof( local_nonce ) );
+#endif
 
     status = psa_generate_random( local_nonce, required_nonce_size );
     if( status != PSA_SUCCESS )