diff --git a/src/libstrongswan/credentials/sets/mem_cred.c b/src/libstrongswan/credentials/sets/mem_cred.c
index ca3ee365f..f1d40dd4b 100644
--- a/src/libstrongswan/credentials/sets/mem_cred.c
+++ b/src/libstrongswan/credentials/sets/mem_cred.c
@@ -90,7 +90,7 @@ static bool certs_filter(cert_data_t *data, certificate_t **in, certificate_t **
 		{
 			if (data->key == KEY_ANY || data->key == public->get_type(public))
 			{
-				if (public->has_fingerprint(public,
+				if (data->id && public->has_fingerprint(public,
 											data->id->get_encoding(data->id)))
 				{
 					public->destroy(public);