diff --git a/.gitignore b/.gitignore
index 998ebd1d850f07a8afdb550c8c6780a33dab3935..0400075052efd799519ba894abd902d40b3cec96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .env
-boiler.csv
\ No newline at end of file
+boiler.csv
+boiler.txt
\ No newline at end of file
diff --git a/mqttclient/main.go b/mqttclient/main.go
index 575d341c6de1751df120d46fc027f14ab54267f0..9809680f3444a90ec2d02ff0c6a693439d36c5f0 100644
--- a/mqttclient/main.go
+++ b/mqttclient/main.go
@@ -3,6 +3,7 @@ package mqttclient
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"jonasled.dev/jonasled/ems-esp-logger/csv"
@@ -18,6 +19,9 @@ var messagePubHandlerBoiler mqtt.MessageHandler = func(client mqtt.Client, msg m
 	log.Log.Debugf("Received message for boiler: %s from topic: %s\n", msg.Payload(), msg.Topic())
 	log.Log.Info("Received new boiler data")
 	csv.JsonToCsv(string(msg.Payload()))
+	if os.Getenv("OUTPUT_FILE_NAME_RAW") != "" {
+		dumpRawData(string(msg.Payload()), os.Getenv("OUTPUT_FILE_NAME_RAW"))
+	}
 
 }
 
@@ -46,3 +50,17 @@ func Init() {
 	}
 	client.Subscribe(os.Getenv("MQTT_TOPIC_BOILER"), 1, messagePubHandlerBoiler)
 }
+
+func dumpRawData(data string, filename string) {
+	data = strings.ReplaceAll(data, "\n", "")
+	data = strings.ReplaceAll(data, "\r", "")
+
+	file, err := os.OpenFile(filename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+
+	file.WriteString(data)
+	file.WriteString("\n")
+}