diff --git a/src/AmsToMqttBridge.h b/src/AmsToMqttBridge.h
index 8245abeb..7cc60fd3 100644
--- a/src/AmsToMqttBridge.h
+++ b/src/AmsToMqttBridge.h
@@ -19,7 +19,13 @@
 #include <OneWire.h>
 #define TEMP_SENSOR_PIN 5 // Temperature sensor connected to GPIO5
 
+#if DEBUG_MODE
+#define SOFTWARE_SERIAL 1
+#include <SoftwareSerial.h>
+SoftwareSerial *hanSerial = new SoftwareSerial(3);
+#else
 HardwareSerial *hanSerial = &Serial;
+#endif
 
 // Build settings for Wemos Lolin D32
 #elif defined(ARDUINO_LOLIN_D32)
diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index 92ae320f..57806ca3 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -35,7 +35,7 @@ WiFiClient *client;
 MQTTClient mqtt(512);
 
 // Object used for debugging
-HardwareSerial* debugger = NULL;
+Stream* debugger = NULL;
 
 // The HAN Port reader, used to read serial data and decode DLMS
 HanReader hanReader;
@@ -47,17 +47,15 @@ void setup() {
 	}
 
 #if DEBUG_MODE
-	debugger = &Serial;
-	#if SOFTWARE_SERIAL
-		debugger->begin(115200, SERIAL_8N1);
-	#else
-		if(config.getMeterType() == 3) {
-			hanSerial->begin(2400, SERIAL_8N1);
-		} else {
-			hanSerial->begin(2400, SERIAL_8E1);
-		}
-	#endif
-	while (!&debugger);
+#if HW_ROARFRED
+	SoftwareSerial *ser = new SoftwareSerial(-1, 1);
+	ser->begin(115200, SWSERIAL_8N1);
+	debugger = ser;
+#else
+	HardwareSerial *ser = &Serial;
+	ser->begin(115200, SERIAL_8N1);
+#endif
+	debugger = ser;
 #endif
 
 	if (debugger) {