diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index 6c722baa..320a7238 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -32,6 +32,10 @@ ADC_MODE(ADC_VCC);
 #endif
 #define WDT_TIMEOUT 60
 
+#if defined(CONFIG_IDF_TARGET_ESP32S2)
+#include <driver/uart.h>
+#endif
+
 #include "version.h"
 
 #include "AmsToMqttBridge.h"
@@ -620,9 +624,7 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
 				hwSerial = &Serial2;
 			}
 		#elif defined(CONFIG_IDF_TARGET_ESP32S2)
-			if(pin == 18) {
-				hwSerial = &Serial1;
-			}
+			hwSerial = &Serial1;
 		#elif defined(CONFIG_IDF_TARGET_ESP32C3)
 		#endif
 	#endif
@@ -655,7 +657,11 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
 				break;
 		}
 
-		#if defined(ESP32)
+		#if defined(CONFIG_IDF_TARGET_ESP32S2)
+			hwSerial->begin(baud, serialConfig, -1, -1, invert);
+			hwSerial->setRxBufferSize(768);
+			uart_set_pin(UART_NUM_1, UART_PIN_NO_CHANGE, pin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
+		#elif defined(ESP32)
 			hwSerial->begin(baud, serialConfig, -1, -1, invert);
 			hwSerial->setRxBufferSize(768);
 		#else
diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index bbbf7238..c583e2ff 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -1047,7 +1047,7 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->vccResistorVcc = 33;
 				break;
 			case 6: // Pow-P1
-				gpioConfig->hanPin = 18;
+				gpioConfig->hanPin = 16;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPinRed = 13;
 				gpioConfig->ledPinGreen = 14;
diff --git a/web/ha2.json b/web/ha2.json
index 9ffcdaf5..06ab3f26 100644
--- a/web/ha2.json
+++ b/web/ha2.json
@@ -3,5 +3,5 @@
     "tPO" : %.2f,
     "tQI" : %.2f,
     "tQO" : %.2f,
-    "rtc" : %llu
+    "rtc" : %lu
 }