diff --git a/lib/AmsData/src/AmsData.cpp b/lib/AmsData/src/AmsData.cpp
index 94936489..bc2a2491 100644
--- a/lib/AmsData/src/AmsData.cpp
+++ b/lib/AmsData/src/AmsData.cpp
@@ -219,7 +219,7 @@ bool AmsData::isTwoPhase() {
 }
 
 int8_t AmsData::getLastError() {
-    return lastErrorCount > 1 ? lastError : 0;
+    return lastErrorCount > 2 ? lastError : 0;
 }
 
 void AmsData::setLastError(int8_t lastError) {
diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index a74f7c3a..625bd4a1 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -758,7 +758,7 @@ void setupHanPort(GpioConfig& gpioConfig, uint32_t baud, uint8_t parityOrdinal,
 			}
 		#endif
 
-		//hwSerial->setRxBufferSize(768);
+		hwSerial->setRxBufferSize(768);
 		#if defined(ESP32)
 		hwSerial->onReceiveError(rxerr);
 		#endif