diff --git a/src/addon/mod/data/fields/checkbox/providers/handler.ts b/src/addon/mod/data/fields/checkbox/providers/handler.ts
index 48c50d8d7..3c3009394 100644
--- a/src/addon/mod/data/fields/checkbox/providers/handler.ts
+++ b/src/addon/mod/data/fields/checkbox/providers/handler.ts
@@ -80,14 +80,10 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
 
-        if (inputData[fieldName] && inputData[fieldName].length > 0) {
-            return [{
-                fieldid: field.id,
-                value: inputData[fieldName]
-            }];
-        }
-
-        return false;
+        return [{
+            fieldid: field.id,
+            value: inputData[fieldName] || []
+        }];
     }
 
     /**
diff --git a/src/addon/mod/data/fields/file/providers/handler.ts b/src/addon/mod/data/fields/file/providers/handler.ts
index 38a58e7de..d6e10b4b1 100644
--- a/src/addon/mod/data/fields/file/providers/handler.ts
+++ b/src/addon/mod/data/fields/file/providers/handler.ts
@@ -72,15 +72,11 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const files = this.getFieldEditFiles(field);
 
-        if (files.length) {
-            return [{
-                fieldid: field.id,
-                subfield: 'file',
-                files: files
-            }];
-        }
-
-        return false;
+        return [{
+            fieldid: field.id,
+            subfield: 'file',
+            files: files
+        }];
     }
 
     /**
diff --git a/src/addon/mod/data/fields/latlong/providers/handler.ts b/src/addon/mod/data/fields/latlong/providers/handler.ts
index fb549c7c4..606db2878 100644
--- a/src/addon/mod/data/fields/latlong/providers/handler.ts
+++ b/src/addon/mod/data/fields/latlong/providers/handler.ts
@@ -66,26 +66,20 @@ export class AddonModDataFieldLatlongHandler implements AddonModDataFieldHandler
      * @return {any}            With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
-        const fieldName = 'f_' + field.id,
-            values = [];
+        const fieldName = 'f_' + field.id;
 
-        if (inputData[fieldName + '_0']) {
-            values.push({
+        return [
+            {
                 fieldid: field.id,
                 subfield: '0',
-                value: inputData[fieldName + '_0']
-            });
-        }
-
-        if (inputData[fieldName + '_1']) {
-            values.push({
+                value: inputData[fieldName + '_0'] || ''
+            },
+            {
                 fieldid: field.id,
                 subfield: '1',
-                value: inputData[fieldName + '_1']
-            });
-        }
-
-        return values;
+                value: inputData[fieldName + '_1'] || ''
+            }
+        ];
     }
 
     /**
diff --git a/src/addon/mod/data/fields/multimenu/providers/handler.ts b/src/addon/mod/data/fields/multimenu/providers/handler.ts
index 716da06bf..7c98f1b8c 100644
--- a/src/addon/mod/data/fields/multimenu/providers/handler.ts
+++ b/src/addon/mod/data/fields/multimenu/providers/handler.ts
@@ -80,14 +80,10 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
 
-        if (inputData[fieldName] && inputData[fieldName].length > 0) {
-            return [{
-                fieldid: field.id,
-                value: inputData[fieldName]
-            }];
-        }
-
-        return false;
+        return [{
+            fieldid: field.id,
+            value: inputData[fieldName] || []
+        }];
     }
 
     /**
diff --git a/src/addon/mod/data/fields/picture/providers/handler.ts b/src/addon/mod/data/fields/picture/providers/handler.ts
index a5eab43b0..89abf7009 100644
--- a/src/addon/mod/data/fields/picture/providers/handler.ts
+++ b/src/addon/mod/data/fields/picture/providers/handler.ts
@@ -70,27 +70,21 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
      * @return {any}            With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
-        const files = this.getFieldEditFiles(field),
-            values = [],
-            fieldName = 'f_' + field.id + '_alttext';
+        const files = this.getFieldEditFiles(field);
+        const fieldName = 'f_' + field.id + '_alttext';
 
-        if (files.length) {
-            values.push({
+        return [
+            {
                 fieldid: field.id,
                 subfield: 'file',
                 files: files
-            });
-        }
-
-        if (inputData[fieldName]) {
-            values.push({
+            },
+            {
                 fieldid: field.id,
                 subfield: 'alttext',
                 value: inputData[fieldName]
-            });
-        }
-
-        return values;
+            }
+        ];
     }
 
     /**
diff --git a/src/addon/mod/data/fields/radiobutton/providers/handler.ts b/src/addon/mod/data/fields/radiobutton/providers/handler.ts
index 6efbd744b..a58b407bf 100644
--- a/src/addon/mod/data/fields/radiobutton/providers/handler.ts
+++ b/src/addon/mod/data/fields/radiobutton/providers/handler.ts
@@ -67,14 +67,10 @@ export class AddonModDataFieldRadiobuttonHandler implements AddonModDataFieldHan
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
 
-        if (inputData[fieldName]) {
-            return [{
-                fieldid: field.id,
-                value: inputData[fieldName]
-            }];
-        }
-
-        return false;
+        return [{
+            fieldid: field.id,
+            value: inputData[fieldName] || ''
+        }];
     }
 
     /**
diff --git a/src/addon/mod/data/fields/text/providers/handler.ts b/src/addon/mod/data/fields/text/providers/handler.ts
index 19d49b713..1a4fa8c26 100644
--- a/src/addon/mod/data/fields/text/providers/handler.ts
+++ b/src/addon/mod/data/fields/text/providers/handler.ts
@@ -68,14 +68,10 @@ export class AddonModDataFieldTextHandler implements AddonModDataFieldHandler {
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
 
-        if (inputData[fieldName]) {
-            return [{
-                fieldid: field.id,
-                value: inputData[fieldName]
-            }];
-        }
-
-        return false;
+        return [{
+            fieldid: field.id,
+            value: inputData[fieldName] || ''
+        }];
     }
 
     /**
diff --git a/src/addon/mod/data/fields/textarea/providers/handler.ts b/src/addon/mod/data/fields/textarea/providers/handler.ts
index 8ffcdcf4b..6bbc7d9d8 100644
--- a/src/addon/mod/data/fields/textarea/providers/handler.ts
+++ b/src/addon/mod/data/fields/textarea/providers/handler.ts
@@ -50,32 +50,27 @@ export class AddonModDataFieldTextareaHandler extends AddonModDataFieldTextHandl
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
+        const files = this.getFieldEditFiles(field, inputData, originalFieldData);
+        let text = this.textUtils.restorePluginfileUrls(inputData[fieldName] || '', files);
+        // Add some HTML to the text if needed.
+        text = this.textUtils.formatHtmlLines(text);
 
-        if (inputData[fieldName]) {
-            const files = this.getFieldEditFiles(field, inputData, originalFieldData);
-            let text = this.textUtils.restorePluginfileUrls(inputData[fieldName], files);
-
-            // Add some HTML to the text if needed.
-            text = this.textUtils.formatHtmlLines(text);
-
-            return [{
-                    fieldid: field.id,
-                    value: text
-                },
-                {
-                    fieldid: field.id,
-                    subfield: 'content1',
-                    value: 1
-                },
-                {
-                    fieldid: field.id,
-                    subfield: 'itemid',
-                    files: files
-                }
-            ];
-        }
-
-        return false;
+        return [
+            {
+                fieldid: field.id,
+                value: text
+            },
+            {
+                fieldid: field.id,
+                subfield: 'content1',
+                value: 1
+            },
+            {
+                fieldid: field.id,
+                subfield: 'itemid',
+                files: files
+            }
+        ];
     }
 
     /**