diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6840b23ec..feb6f39d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -849,8 +849,6 @@ function(get_flags CCID CCVER)
     set(GF_CXX_FLAGS ${CXX_FLAGS} PARENT_SCOPE)
 endfunction()
 
-list(APPEND CXX_FLAGS -std=c++17)
-
 if (LLAMA_FATAL_WARNINGS)
     if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         list(APPEND C_FLAGS   -Werror)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index f34249532..8a6dbcd82 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -84,5 +84,5 @@ if (LLAMA_CURL)
 endif ()
 
 target_include_directories(${TARGET} PUBLIC .)
-target_compile_features(${TARGET} PUBLIC cxx_std_11)
+target_compile_features(${TARGET} PUBLIC cxx_std_17)
 target_link_libraries(${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama)