diff --git a/library/constant_time.c b/library/constant_time.c
index d01998bd72..2b62bc176b 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -708,7 +708,8 @@ int mbedtls_mpi_safe_cond_swap( mbedtls_mpi *X,
                                 mbedtls_mpi *Y,
                                 unsigned char swap )
 {
-    int ret, s;
+    int ret = 0;
+    int s;
     MPI_VALIDATE_RET( X != NULL );
     MPI_VALIDATE_RET( Y != NULL );