diff --git a/mqttclient/main.go b/mqttclient/main.go
index b349ef54911931b3440d377ca8c31acd233b9fcc..4ebed07d0fb6f0aca2e31fb13c5952e9ebab3ee8 100644
--- a/mqttclient/main.go
+++ b/mqttclient/main.go
@@ -26,7 +26,7 @@ var messagePubHandlerBoiler mqtt.MessageHandler = func(client mqtt.Client, msg m
 	if os.Getenv("OUTPUT_FILE_NAME_RAW") != "" {
 		dumpRawData(string(msg.Payload()), os.Getenv("OUTPUT_FILE_NAME_RAW"))
 	}
-	if os.Getenv("OUTPUT_DATABSE") != "" {
+	if os.Getenv("OUTPUT_DATABSE") != "" || os.Getenv("CLIENT_USE_SERVER") == "true" {
 		task := types.Task{
 			Date:     time.Now().UTC(),
 			Data:     string(msg.Payload()),