diff --git a/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h b/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h
index 05abfb70..23bafcfd 100644
--- a/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h
+++ b/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h
@@ -29,7 +29,7 @@ License along with NeoPixel.  If not, see
 #pragma once
 
 #if defined(ARDUINO_ARCH_ESP32)
-#if !defined(WLED_USE_SHARED_RMT)  && !defined(__riscv) && (ESP_IDF_VERSION_MAJOR >= 4) // WLEDMM don't compile this file on unsupported platforms
+#if !defined(WLED_USE_SHARED_RMT) // WLEDMM don't compile this file on unsupported platforms
 
 // Use the NeoEspRmtSpeed types from the driver-based implementation
 #include <NeoPixelBus.h>
diff --git a/lib/NeoESP32RmtHI/src/NeoEsp32RmtHI.S b/lib/NeoESP32RmtHI/src/NeoEsp32RmtHI.S
index 9be11a65..25a80d89 100644
--- a/lib/NeoESP32RmtHI/src/NeoEsp32RmtHI.S
+++ b/lib/NeoESP32RmtHI/src/NeoEsp32RmtHI.S
@@ -5,8 +5,12 @@
  *
  */
 
+#if !defined(ESP32) && !defined(ESP8266)   // WLEDMM buildenv sanity check (experimental)
+#error neither ESP32 nor ESP8266, don't know what to do
+#endif
+
 #if defined(__XTENSA__) && defined(ESP32) && !defined(CONFIG_BTDM_CTRL_HLI)
-#if !defined(WLED_USE_SHARED_RMT)  && !defined(__riscv) && defined(ARDUINO_ARCH_ESP32) && (ESP_IDF_VERSION_MAJOR >= 4) // WLEDMM don't compile this file on unsupported platforms
+#if !defined(WLED_USE_SHARED_RMT) // WLEDMM don't compile this file on unsupported platforms
 
 #include <freertos/xtensa_context.h>
 #include "sdkconfig.h"
@@ -261,5 +265,5 @@ ld_include_hli_vectors_rmt:
 
 
 #endif // CONFIG_BTDM_CTRL_HLI
-#endif // WLEDMM
+#endif // WLED_USE_SHARED_RMT
 #endif // XTensa
\ No newline at end of file
diff --git a/lib/NeoESP32RmtHI/src/NeoEsp32RmtHIMethod.cpp b/lib/NeoESP32RmtHI/src/NeoEsp32RmtHIMethod.cpp
index 63cd3163..ff1465e5 100644
--- a/lib/NeoESP32RmtHI/src/NeoEsp32RmtHIMethod.cpp
+++ b/lib/NeoESP32RmtHI/src/NeoEsp32RmtHIMethod.cpp
@@ -30,7 +30,7 @@ License along with NeoPixel.  If not, see
 #include <Arduino.h>
 
 #if defined(ARDUINO_ARCH_ESP32)
-#if !defined(WLED_USE_SHARED_RMT)  && !defined(__riscv) && (ESP_IDF_VERSION_MAJOR >= 4) // WLEDMM don't compile this file on unsupported platforms
+#if !defined(WLED_USE_SHARED_RMT) // WLEDMM don't compile this file on unsupported platforms
 
 #include <algorithm>  
 #include "esp_idf_version.h"