diff --git a/kuksa-sdk/src/main/kotlin/org/eclipse/kuksa/DataBrokerTransporter.kt b/kuksa-sdk/src/main/kotlin/org/eclipse/kuksa/DataBrokerTransporter.kt
index 77f19c05..a3b8c66a 100644
--- a/kuksa-sdk/src/main/kotlin/org/eclipse/kuksa/DataBrokerTransporter.kt
+++ b/kuksa-sdk/src/main/kotlin/org/eclipse/kuksa/DataBrokerTransporter.kt
@@ -191,10 +191,10 @@ internal class DataBrokerTransporter(
             }
         }
 
-        builder.build()
+        val dataEntry = builder.build()
 
         return KuksaValV1.EntryUpdate.newBuilder()
-            .setEntry(builder.build())
+            .setEntry(dataEntry)
             .addFields(field)
             .build()
     }