diff --git a/cpu/esp32/Kconfig b/cpu/esp32/Kconfig
index 9455c4ebaa..9a69f978ac 100644
--- a/cpu/esp32/Kconfig
+++ b/cpu/esp32/Kconfig
@@ -9,13 +9,17 @@ config CPU_CORE_XTENSA_LX6
     bool
     select CPU_ARCH_XTENSA
 
+config CPU_ARCH_ESP32_XTENSA
+    bool
+    select HAS_ESP_HW_COUNTER
+
 config CPU_FAM_ESP32
     bool
     select CPU_COMMON_ESP
     select CPU_CORE_XTENSA_LX6
+    select CPU_ARCH_ESP32_XTENSA
     select HAS_ARCH_ESP32
     select HAS_CPU_ESP32
-    select HAS_ESP_HW_COUNTER
     select HAS_ESP_WIFI_ENTERPRISE
     select HAS_PUF_SRAM
 
diff --git a/cpu/esp32/Makefile.features b/cpu/esp32/Makefile.features
index f1542dad50..9b05c4f403 100644
--- a/cpu/esp32/Makefile.features
+++ b/cpu/esp32/Makefile.features
@@ -11,9 +11,12 @@ include $(RIOTCPU)/esp_common/Makefile.features
 
 FEATURES_PROVIDED += arch_esp32
 FEATURES_PROVIDED += esp_wifi_enterprise
-FEATURES_PROVIDED += esp_hw_counter
 FEATURES_PROVIDED += puf_sram
 
+ifeq (xtensa,$(CPU_ARCH))
+  FEATURES_PROVIDED += esp_hw_counter
+endif
+
 ifneq (,$(filter esp32-wrover%,$(CPU_MODEL)))
   FEATURES_PROVIDED += esp_spi_ram
 endif