diff --git a/js/libs/form.js b/js/libs/form.js
index ec800471..639fb31d 100644
--- a/js/libs/form.js
+++ b/js/libs/form.js
@@ -175,7 +175,7 @@ Fliplet().then(function() {
             _.mapKeys(Fliplet.Navigate.query, function(value, key) {
               if (key === field.defaultValueKey) {
                 _.forEach(field.rowOptions, function(row) {
-                  var val = row.id ? row.id : row.label;
+                  var val = row.id || row.label;
 
                   if (!_.has(matrixValue, val)) {
                     matrixValue[val] = value;
@@ -305,7 +305,7 @@ Fliplet().then(function() {
                 }
 
                 _.forEach(field.rowOptions, function(row) {
-                  var val = row.id ? row.id : row.label;
+                  var val = row.id || row.label;
                   var matrixKey = entry.data[`${fieldKey} [${val}]`] ? entry.data[`${fieldKey} [${val}]`] : entry.data[`${fieldKey}`];
 
                   if (isResetAction) {
@@ -1012,7 +1012,7 @@ Fliplet().then(function() {
                     });
                   } else {
                     _.forEach(field.rowOptions, function(row) {
-                      var val = row.id ? row.id : row.label;
+                      var val = row.id || row.label;
 
                       appendField(`${field.name} [${val}]`, '');
                     });
@@ -1040,6 +1040,16 @@ Fliplet().then(function() {
                     append: false
                   };
                 }
+
+                if (field._type === 'flMatrix') {
+                  formData._flSchema.excludedFields = [];
+
+                  _.forEach(field.rowOptions, function(row) {
+                    var val = row.id || row.label;
+
+                    formData._flSchema.excludedFields.push(`${field.name} [${val}]`);
+                  });
+                }
               });
 
               if (entryId && entry && data.dataSourceId) {