diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17c8d7ee3d..e6aced198a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,11 +44,7 @@ project(faiss
   LANGUAGES ${FAISS_LANGUAGES})
 include(GNUInstallDirs)
 
-if(FAISS_ENABLE_RAFT)
 set(CMAKE_CXX_STANDARD 17)
-else()
-set(CMAKE_CXX_STANDARD 11)
-endif()
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
diff --git a/faiss/python/CMakeLists.txt b/faiss/python/CMakeLists.txt
index 0e1f4c2f0d..fef27d9b2a 100644
--- a/faiss/python/CMakeLists.txt
+++ b/faiss/python/CMakeLists.txt
@@ -11,7 +11,7 @@ project(pyfaiss
   HOMEPAGE_URL "https://github.com/facebookresearch/faiss"
   LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 
 find_package(SWIG REQUIRED COMPONENTS python)
 include(${SWIG_USE_FILE})