diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 4208bd105..84964ecf1 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -1097,6 +1097,9 @@ void sal_certificates_chain_parse_directory(char **certificate_pem, char **key_p
 	}
 	/* generate the fingerprint as described in RFC4572 if needed */
 	if ((generate_dtls_fingerprint == TRUE) && (fingerprint != NULL)) {
+		if (*fingerprint != NULL) {
+			ms_free(*fingerprint);
+		}
 		*fingerprint = belle_sip_certificates_chain_get_fingerprint(certificate);
 	}
 
diff --git a/mediastreamer2 b/mediastreamer2
index a27c77bdc..d5389594e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a27c77bdc96bbc4d727a5d6226a0587cbe8c5aa3
+Subproject commit d5389594e93c3499d70d9ddd556f9aac62aabc0a