diff --git a/contrib/annoy-cmake/CMakeLists.txt b/contrib/annoy-cmake/CMakeLists.txt
index e54f06afb5d..bdef7d92132 100644
--- a/contrib/annoy-cmake/CMakeLists.txt
+++ b/contrib/annoy-cmake/CMakeLists.txt
@@ -7,8 +7,8 @@ option(ENABLE_ANNOY "Enable Annoy index support" ${ENABLE_LIBRARIES})
 # Problem with aligment can lead to errors like
 # (https://stackoverflow.com/questions/46790550/c-undefined-behavior-strict-aliasing-rule-or-incorrect-alignment)
 # or will lead to crash on arm https://developer.arm.com/documentation/ka003038/latest
-# This issues should be resolved before annoy became non-experimental
-if ((NOT ENABLE_ANNOY) OR (SANITIZE STREQUAL "undefined") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm"))
+# This issues should be resolved before annoy became non-experimental (--> setting "allow_experimental_annoy_index")
+if ((NOT ENABLE_ANNOY) OR (SANITIZE STREQUAL "undefined") OR (ARCH_AARCH64))
     message (STATUS "Not using annoy")
     return()
 endif()
diff --git a/docs/en/engines/table-engines/mergetree-family/annindexes.md b/docs/en/engines/table-engines/mergetree-family/annindexes.md
index 6c669a4f7b6..3b2431e4b5b 100644
--- a/docs/en/engines/table-engines/mergetree-family/annindexes.md
+++ b/docs/en/engines/table-engines/mergetree-family/annindexes.md
@@ -46,6 +46,8 @@ Both types of queries are handled the same way. The indexes get `n` neighbors (w
 
 ## Create table with ANNIndex
 
+This feature is disabled by default. To enable it, set `allow_experimental_annoy_index` to 1. Also, this feature is disabled for arm, due to likely problems with the algorithm.
+
 ```sql
 CREATE TABLE t
 (