diff --git a/cmake/functions.cmake b/cmake/functions.cmake
index 2e96fcf50..6e27bde8e 100644
--- a/cmake/functions.cmake
+++ b/cmake/functions.cmake
@@ -84,9 +84,7 @@ function(generate_build_flags)
     if(WOLFSSL_ED25519 OR WOLFSSL_USER_SETTINGS)
         set(BUILD_ED25519 "yes" PARENT_SCOPE)
     endif()
-    if(WOLFSSL_ED25519_SMALL OR WOLFSSL_USER_SETTINGS)
-        set(BUILD_ED25519_SMALL "yes" PARENT_SCOPE)
-    endif()
+    set(BUILD_ED25519_SMALL ${WOLFSSL_ED25519_SMALL} PARENT_SCOPE)
     if(WOLFSSL_FEMATH OR WOLFSSL_USER_SETTINGS)
         set(BUILD_FEMATH "yes" PARENT_SCOPE)
     endif()
@@ -96,9 +94,7 @@ function(generate_build_flags)
     if(WOLFSSL_CURVE25519 OR WOLFSSL_USER_SETTINGS)
         set(BUILD_CURVE25519 "yes" PARENT_SCOPE)
     endif()
-    if(WOLFSSL_CURVE25519_SMALL OR WOLFSSL_USER_SETTINGS)
-        set(BUILD_CURVE25519_SMALL "yes" PARENT_SCOPE)
-    endif()
+    set(BUILD_CURVE25519_SMALL ${WOLFSSL_CURVE25519_SMALL} PARENT_SCOPE)
     if(WOLFSSL_ED448 OR WOLFSSL_USER_SETTINGS)
         set(BUILD_ED448 "yes" PARENT_SCOPE)
     endif()