diff --git a/mqttclient/main.go b/mqttclient/main.go
index 9809680f3444a90ec2d02ff0c6a693439d36c5f0..f459ffc630cd6d842c82ff9cda190264e1efd6f8 100644
--- a/mqttclient/main.go
+++ b/mqttclient/main.go
@@ -1,9 +1,10 @@
 package mqttclient
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
-	"strings"
+	"time"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"jonasled.dev/jonasled/ems-esp-logger/csv"
@@ -52,8 +53,19 @@ func Init() {
 }
 
 func dumpRawData(data string, filename string) {
-	data = strings.ReplaceAll(data, "\n", "")
-	data = strings.ReplaceAll(data, "\r", "")
+	var jsonData map[string]interface{}
+	err := json.Unmarshal([]byte(data), &jsonData)
+	if err != nil {
+		panic(err)
+	}
+
+	currentTime := time.Now().Local().Format("2006-01-02 15:04:05")
+	jsonData["date"] = currentTime
+
+	updatedData, err := json.Marshal(jsonData)
+	if err != nil {
+		panic(err)
+	}
 
 	file, err := os.OpenFile(filename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
 	if err != nil {
@@ -61,6 +73,6 @@ func dumpRawData(data string, filename string) {
 	}
 	defer file.Close()
 
-	file.WriteString(data)
+	file.WriteString(string(updatedData))
 	file.WriteString("\n")
 }