diff --git a/library/x509_csr.c b/library/x509_csr.c
index b71bc0b..8104346 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -99,6 +99,8 @@
     pem_context pem;
 #endif
 
+    memset( &sig_params, 0, sizeof( x509_buf ) );
+
     /*
      * Check for valid input
      */
@@ -262,10 +264,6 @@
         return( POLARSSL_ERR_X509_UNKNOWN_SIG_ALG );
     }
 
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
-    memcpy( &csr->sig_params, &sig_params, sizeof( x509_buf ) );
-#endif
-
     if( ( ret = x509_get_sig( &p, end, &csr->sig ) ) != 0 )
     {
         x509_csr_free( csr );