diff --git a/CMakeLists.txt b/CMakeLists.txt
index b69b8dc..57fa2a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,6 +119,10 @@ if(TESSESFRAMEWORK_FETCHCONTENT)
 set(MBEDTLS_FATAL_WARNINGS OFF CACHE INTERNAL "For TessesFramework" FORCE)
 set(ENABLE_TESTING OFF CACHE INTERNAL "For TessesFramework" FORCE)
 set(ENABLE_PROGRAMS OFF CACHE INTERNAL "For TessesFramework" FORCE)
+if(NOT TESSESFRAMEWORK_ENABLE_STATIC)
+
+set(USE_STATIC_MBEDTLS_LIBRARY OFF CACHE INTERNAL "For TessesFramework" FORCE)
+endif()
 if(TESSESFRAMEWORK_ENABLE_SHARED)
 set(USE_SHARED_MBEDTLS_LIBRARY ON CACHE INTERNAL "For TessesFramework" FORCE)
 endif()
@@ -226,8 +230,12 @@ add_library(tessesframework STATIC ${TESSESFRAMEWORK_SOURCE})
 TESSESFRAMEWORK_LINKDEPS(tessesframework)
 
 if(TESSESFRAMEWORK_FETCHCONTENT AND TESSESFRAMEWORK_ENABLE_MBED)
-target_link_libraries(tessesframework PUBLIC mbedtls mbedx509 mbedcrypto everest p256m)
+if(TESSESFRAMEWORK_ENABLE_SHARED)
+target_link_libraries(tessesframework PUBLIC mbedtls_static mbedx509_static mbedcrypto_static)
+else()
 
+target_link_libraries(tessesframework PUBLIC mbedtls mbedx509 mbedcrypto everest p256m)
+endif()
 endif()
 list(APPEND TessesFrameworkLibs tessesframework)
 endif()
@@ -259,6 +267,9 @@ list(APPEND TessesFrameworkLibs tessesframework_shared)
 
 if((TESSESFRAMEWORK_ENABLE_STATIC OR TESSESFRAMEWORK_ENABLE_SHARED) AND TESSESFRAMEWORK_FETCHCONTENT AND TESSESFRAMEWORK_ENABLE_MBED)
 list(APPEND TessesFrameworkLibs mbedtls mbedx509 mbedcrypto everest p256m)
+if(TESSESFRAMEWORK_ENABLE_STATIC AND TESSESFRAMEWORK_ENABLE_SHARED)
+list(APPEND TessesFrameworkLibs mbedtls_static mbedx509_static mbedcrypto_static)
+endif()
 endif()
 
 endif()