diff --git a/packages/core/src/trait_manager/model/Trait.ts b/packages/core/src/trait_manager/model/Trait.ts
index c037793056..a9b36e8fc4 100644
--- a/packages/core/src/trait_manager/model/Trait.ts
+++ b/packages/core/src/trait_manager/model/Trait.ts
@@ -110,7 +110,7 @@ export default class Trait extends Model<TraitProperties> {
   }
 
   updateValueFromDataVariable(value: string) {
-    this.setTargetValue(value);
+    this.setValue(value);
     this.trigger('change:value');
   }
 
diff --git a/packages/core/src/trait_manager/view/TraitView.ts b/packages/core/src/trait_manager/view/TraitView.ts
index 7490d82170..03c94050de 100644
--- a/packages/core/src/trait_manager/view/TraitView.ts
+++ b/packages/core/src/trait_manager/view/TraitView.ts
@@ -117,13 +117,15 @@ export default class TraitView extends View<Trait> {
    * On change callback
    * @private
    */
-  onValueChange(model: Trait, value: string, opts: SetOptions & { fromTarget?: boolean } = {}) {
+  onValueChange(_m: Trait, _v: string, opts: SetOptions & { fromTarget?: boolean } = {}) {
+    const { model } = this;
+    const value = this.getValueForTarget();
+
     if (opts.fromTarget) {
-      this.setInputValue(model.get('value'));
+      this.setInputValue(value);
       this.postUpdate();
     } else {
-      const val = this.getValueForTarget();
-      model?.setTargetValue(val, opts);
+      model.setValue(value, opts as any);
     }
   }