diff --git a/modules/cmsis/CMakeLists.txt b/modules/cmsis/CMakeLists.txt
index d23bcaea979..4044ae891b3 100644
--- a/modules/cmsis/CMakeLists.txt
+++ b/modules/cmsis/CMakeLists.txt
@@ -1,8 +1,7 @@
 # Copyright (c) 2023 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} cmsis)
-
 if(CONFIG_CPU_AARCH32_CORTEX_A OR CONFIG_CPU_AARCH32_CORTEX_R)
+  add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} cmsis)
   zephyr_include_directories(.)
 endif()
diff --git a/modules/cmsis_6/CMakeLists.txt b/modules/cmsis_6/CMakeLists.txt
index 0592be9a557..16bc698857f 100644
--- a/modules/cmsis_6/CMakeLists.txt
+++ b/modules/cmsis_6/CMakeLists.txt
@@ -1,8 +1,7 @@
 # Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} cmsis_6)
-
 if(CONFIG_CPU_CORTEX_M)
+  add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} cmsis_6)
   zephyr_include_directories(.)
 endif()