diff --git a/ChangeLog b/ChangeLog
index 7e9190097..bca38b54f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,8 @@ Bugfix
    * Fix Visual Studio Release x64 build configuration by inheriting
      PlatformToolset from the project configuration. Fixes #1430 reported by
      irwir.
+   * Enable Suite B with subset of ECP curves. Make sure the code compiles even
+     if some curves are not defined. Fixes #1591 reported by dbedev.
 
 API Changes
    * Extend the MBEDTLS_SSL_EXPORT_KEYS to export the handshake randbytes,
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index d9e777d8a..68a1e592e 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -10536,8 +10536,12 @@ static int ssl_preset_suiteb_hashes[] = {
 
 #if defined(MBEDTLS_ECP_C)
 static mbedtls_ecp_group_id ssl_preset_suiteb_curves[] = {
+#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
     MBEDTLS_ECP_DP_SECP256R1,
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
     MBEDTLS_ECP_DP_SECP384R1,
+#endif
     MBEDTLS_ECP_DP_NONE
 };
 #endif