diff --git a/src/fireedge/src/modules/components/Forms/UserInputs.js b/src/fireedge/src/modules/components/Forms/UserInputs.js
index 9512aa29cf..fb83c23eed 100644
--- a/src/fireedge/src/modules/components/Forms/UserInputs.js
+++ b/src/fireedge/src/modules/components/Forms/UserInputs.js
@@ -308,6 +308,7 @@ const schemaUserInput = ({
       config.validation = array(string().trim())
         .concat(requiredSchema(mandatory, array()))
         .default(() => defaultValues)
+        .afterSubmit((value) => value?.length ? value.join(',') : undefined)
 
       // values: List of values to show to the user
       config.values = values
diff --git a/src/fireedge/src/modules/utils/schema.js b/src/fireedge/src/modules/utils/schema.js
index 671cb2137d..7aa4ee22ad 100644
--- a/src/fireedge/src/modules/utils/schema.js
+++ b/src/fireedge/src/modules/utils/schema.js
@@ -364,7 +364,8 @@ export const schemaUserInput = ({
         multiple: true,
         validation: array(string().trim())
           .concat(requiredSchema(mandatory, array()))
-          .default(defaultValues),
+          .default(defaultValues)
+          .afterSubmit((value) => value?.length ? value.join(',') : undefined)
       }
     }
     default: