diff --git a/cmake/modules/FindmbedTLS.cmake b/cmake/modules/FindmbedTLS.cmake
index 9286e8e8d..bc7088fcf 100644
--- a/cmake/modules/FindmbedTLS.cmake
+++ b/cmake/modules/FindmbedTLS.cmake
@@ -44,9 +44,9 @@ IF(MBEDTLS_FOUND)
     STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
     STRING(REGEX REPLACE "^lib" "" TFPSACRYPTO_LIBRARY_FILE ${TFPSACRYPTO_LIBRARY_FILE})
 
-    if (NOT TFPSACRYPTO_LIBRARY_FILE STREQUAL "")
+    if (TFPSACRYPTO_LIBRARY)
         SET(MBEDTLS_CRYPTO_LIBRARY_FILE ${TFPSACRYPTO_LIBRARY_FILE})
-    elseif (NOT MBEDCRYPTO_LIBRARY_FILE STREQUAL "")
+    elseif (MBEDCRYPTO_LIBRARY)
         SET(MBEDTLS_CRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
     else ()
         MESSAGE(FATAL_ERROR "Could not find mbedTLS Crypto library")