diff --git a/src/mixins/extensions/DataManager.js b/src/mixins/extensions/DataManager.js
index 0f2264964..532d51e10 100644
--- a/src/mixins/extensions/DataManager.js
+++ b/src/mixins/extensions/DataManager.js
@@ -12,8 +12,8 @@ export default {
           screen,
           safeDotName,
           `
-            this.getValue(${JSON.stringify(v.name)}, this.vdata) || 
-            this.getValue(${JSON.stringify(v.name)}, data) || 
+            this.getValue(${JSON.stringify(v.name)}, this.vdata) ?? 
+            this.getValue(${JSON.stringify(v.name)}, data) ?? 
             this.initialValue(
               '${component}',
               '${dataFormat}',
diff --git a/src/mixins/extensions/DefaultValues.js b/src/mixins/extensions/DefaultValues.js
index 1f9915847..b0ebc20c6 100644
--- a/src/mixins/extensions/DefaultValues.js
+++ b/src/mixins/extensions/DefaultValues.js
@@ -29,8 +29,8 @@ export default {
       const defaultComputedName = `default_${safeDotName}__`;
       this.addData(screen, `${name}_was_filled__`, `!!this.getValue(${JSON.stringify(name)}, this.vdata) || !!this.getValue(${JSON.stringify(name)}, data)`);
       this.addMounted(
-        screen, 
-        `if (!this.${safeDotName}) {
+        screen,
+        `if (this.${safeDotName} === undefined || this.${safeDotName} === null || this.${safeDotName} === false || this.${safeDotName} === "") {
             this.tryFormField(${JSON.stringify(name)}, () => {
             this.${safeDotName} = ${value};
             this.setValue(${JSON.stringify(name)}, ${value}, this.vdata, this);});