diff --git a/lib/esp32-psram/src/esp32-psram.h b/lib/esp32-psram/src/esp32-psram.h
index a69d9f4cd..b7b6c436d 100644
--- a/lib/esp32-psram/src/esp32-psram.h
+++ b/lib/esp32-psram/src/esp32-psram.h
@@ -12,7 +12,9 @@
 // Include all library components
 #include "esp32-psram/AllocatorPSRAM.h"   // PSRAM-backed vector
 #include "esp32-psram/VectorPSRAM.h"   // PSRAM-backed vector
-#include "esp32-psram/VectorHIMEM.h"   // HIMEM-backed vector
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32-psram/VectorHIMEM.h"   // HIMEM-backed vector (ESP32 only)
+#endif
 // #include "esp32-psram/InMemoryFile.h"    // File interface using vectors
 // #include "esp32-psram/PSRAM.h"         // PSRAM file system
 // #include "esp32-psram/HIMEM.h"         // HIMEM file system
diff --git a/lib/esp32-psram/src/esp32-psram/HimemBlock.h b/lib/esp32-psram/src/esp32-psram/HimemBlock.h
index c6eb7d68a..f12b28b97 100644
--- a/lib/esp32-psram/src/esp32-psram/HimemBlock.h
+++ b/lib/esp32-psram/src/esp32-psram/HimemBlock.h
@@ -1,5 +1,8 @@
 #pragma once
 
+// HIMEM is only available on original ESP32
+#if CONFIG_IDF_TARGET_ESP32
+
 #include <algorithm>
 #include <limits>
 #include <memory>
@@ -360,3 +363,5 @@ class HimemBlock {
 };
 
 }  // namespace esp32_psram
+
+#endif  // CONFIG_IDF_TARGET_ESP32
diff --git a/lib/esp32-psram/src/esp32-psram/RingBufferStream.h b/lib/esp32-psram/src/esp32-psram/RingBufferStream.h
index b32046789..b2062c562 100644
--- a/lib/esp32-psram/src/esp32-psram/RingBufferStream.h
+++ b/lib/esp32-psram/src/esp32-psram/RingBufferStream.h
@@ -238,7 +238,9 @@ using RingBufferStreamPSRAM = RingBufferStream<VectorPSRAM<uint8_t>>;
 /**
  * @brief Type alias for a RingBufferStream that uses HIMEM-backed vector storage
  */
+#if CONFIG_IDF_TARGET_ESP32
 using RingBufferStreamHIMEM = RingBufferStream<VectorHIMEM<uint8_t>>;
+#endif
 
 /**
  * @brief Type alias for a RingBufferStream that uses std::vector storage
diff --git a/lib/esp32-psram/src/esp32-psram/TypedRingBuffer.h b/lib/esp32-psram/src/esp32-psram/TypedRingBuffer.h
index 84ec9ab21..44f5344e0 100644
--- a/lib/esp32-psram/src/esp32-psram/TypedRingBuffer.h
+++ b/lib/esp32-psram/src/esp32-psram/TypedRingBuffer.h
@@ -209,8 +209,10 @@ using TypedRingBufferRAM = TypedRingBuffer<T, std::vector<T>>;
 /**
  * @brief Type alias for a typed ring buffer that uses HIMEM-backed vector storage
  */
+#if CONFIG_IDF_TARGET_ESP32
 template<typename T>
 using TypedRingBufferHIMEM = TypedRingBuffer<T, VectorHIMEM<T>>;
+#endif
 
 /**
  * @brief Type alias for a typed ring buffer that uses PSRAM-backed vector storage
diff --git a/lib/esp32-psram/src/esp32-psram/VectorHIMEM.h b/lib/esp32-psram/src/esp32-psram/VectorHIMEM.h
index ed00d27d4..e3951a087 100644
--- a/lib/esp32-psram/src/esp32-psram/VectorHIMEM.h
+++ b/lib/esp32-psram/src/esp32-psram/VectorHIMEM.h
@@ -1,5 +1,8 @@
 #pragma once
 
+// HIMEM is only available on original ESP32
+#if CONFIG_IDF_TARGET_ESP32
+
 #include "HimemBlock.h"
 
 namespace esp32_psram {
@@ -526,4 +529,6 @@ void swap(VectorHIMEM<T>& lhs, VectorHIMEM<T>& rhs) noexcept {
   lhs.swap(rhs);
 }
 
-}  // namespace esp32_psram
\ No newline at end of file
+}  // namespace esp32_psram
+
+#endif  // CONFIG_IDF_TARGET_ESP32
\ No newline at end of file