diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index 9978f2487..96a6c0582 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -24,7 +24,7 @@
 #endif
 #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
 #include "modules/ExternalNotificationModule.h"
-#if !defined(TTGO_T_ECHO)
+#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO) && !defined(CONFIG_IDF_TARGET_ESP32S2)
 #include "modules/SerialModule.h"
 #endif
 #endif
@@ -63,7 +63,7 @@ void setupModules()
     new DeviceTelemetryModule();
     new EnvironmentTelemetryModule();
 #endif
-#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO)
+#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO) && !defined(CONFIG_IDF_TARGET_ESP32S2)
     new SerialModule();
 #endif
 #ifdef ARCH_ESP32
diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
index 94f48aa9a..958faeebe 100644
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -46,6 +46,8 @@
 
 */
 
+#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO) && !defined(CONFIG_IDF_TARGET_ESP32S2)
+
 #define RXD2 16
 #define TXD2 17
 #define RX_BUFFER 128
@@ -92,7 +94,6 @@ bool SerialModule::checkIsConnected()
 
 int32_t SerialModule::runOnce()
 {
-#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO) && !defined(CONFIG_IDF_TARGET_ESP32S2)
     /*
         Uncomment the preferences below if you want to use the module
         without having to configure it from the PythonAPI or WebUI.
@@ -224,9 +225,6 @@ int32_t SerialModule::runOnce()
 
         return INT32_MAX;
     }
-#else
-    return INT32_MAX;
-#endif
 }
 
 MeshPacket *SerialModuleRadio::allocReply()
@@ -252,7 +250,6 @@ void SerialModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 
 ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp)
 {
-#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO) && !defined(CONFIG_IDF_TARGET_ESP32S2)
     if (moduleConfig.serial.enabled) {
         if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_PROTO) {
             // in API mode we don't care about stuff from radio.
@@ -311,8 +308,6 @@ ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp)
     } else {
         DEBUG_MSG("Serial Module Disabled\n");
     }
-
-#endif
-
     return ProcessMessage::CONTINUE; // Let others look at this message also if they want
 }
+#endif
diff --git a/src/modules/SerialModule.h b/src/modules/SerialModule.h
index b390d545e..c853263b6 100644
--- a/src/modules/SerialModule.h
+++ b/src/modules/SerialModule.h
@@ -8,6 +8,8 @@
 #include "Router.h"
 #include <functional>
 
+#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO) && !defined(CONFIG_IDF_TARGET_ESP32S2)
+
 class SerialModule : public StreamAPI, private concurrency::OSThread
 {
     bool firstTime = 1;
@@ -68,3 +70,5 @@ class SerialModuleRadio : public MeshModule
 };
 
 extern SerialModuleRadio *serialModuleRadio;
+
+#endif