diff --git a/messageworker/main.go b/messageworker/main.go
index 0fb8f9ee17dac86da60f1404cab42879b505d2ff..68dc2c42134cdab5cb8ec6a708422306628d96c0 100644
--- a/messageworker/main.go
+++ b/messageworker/main.go
@@ -42,6 +42,7 @@ func Run() {
 				queue.MainQueue.Enqueue(taskData, 60)
 				return
 			}
+			valuesToInsert := []tables.Value{}
 			for key, value := range jsonData {
 				valueType := database.GetOrCreateValueType(key)
 				dbValue := tables.Value{
@@ -50,8 +51,9 @@ func Run() {
 					Value:     helper.AnyToString(value),
 					Instance:  instance,
 				}
-				database.Db.Create(&dbValue)
+				valuesToInsert = append(valuesToInsert, dbValue)
 			}
+			database.Db.Create(&valuesToInsert)
 			log.Log.Info("Stored boiler data in database")
 		}()
 	}