diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75bba07907d..ccca9e04757 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed short wait times in embassy causing hangs (#906)
 - Make sure to clear LP/RTC RAM before loading code (#916)
 - Async RMT channels can be used concurrently (#925)
+- Xtensa: Allow using `embassy-executor`'s thread-mode executor if neither `embassy-executor-thread`, nor `embassy-executor-interrupt` is enabled. (#937)
 
 ### Removed
 
diff --git a/esp-hal-common/src/embassy/executor/xtensa/mod.rs b/esp-hal-common/src/embassy/executor/xtensa/mod.rs
index 918b6b31d11..d2f84587f86 100644
--- a/esp-hal-common/src/embassy/executor/xtensa/mod.rs
+++ b/esp-hal-common/src/embassy/executor/xtensa/mod.rs
@@ -12,6 +12,10 @@ pub mod thread;
 #[cfg(feature = "embassy-executor-thread")]
 pub use thread::*;
 
+#[cfg(any(
+    feature = "embassy-executor-thread",
+    feature = "embassy-executor-interrupt",
+))]
 #[export_name = "__pender"]
 fn __pender(context: *mut ()) {
     let context = (context as usize).to_le_bytes();