diff --git a/src/fireedge/src/client/containers/Provisions/Form/ProvisionForm/Steps/Inputs/schema.js b/src/fireedge/src/client/containers/Provisions/Form/ProvisionForm/Steps/Inputs/schema.js
index 644dbc72eb..1813986f45 100644
--- a/src/fireedge/src/client/containers/Provisions/Form/ProvisionForm/Steps/Inputs/schema.js
+++ b/src/fireedge/src/client/containers/Provisions/Form/ProvisionForm/Steps/Inputs/schema.js
@@ -27,7 +27,7 @@ export const FORM_FIELDS = inputs =>
     max_value: max,
     options
   }) => {
-    const optionsValue = options?.join(',') ?? `${min}..${max}`
+    const optionsValue = options ?? `${min}..${max}`
 
     return {
       name,
diff --git a/src/fireedge/src/client/utils/schema.js b/src/fireedge/src/client/utils/schema.js
index f81a2846df..a81897253b 100644
--- a/src/fireedge/src/client/utils/schema.js
+++ b/src/fireedge/src/client/utils/schema.js
@@ -21,13 +21,16 @@ const requiredSchema = (mandatory, name, schema) =>
     ? schema.required(`${name} field is required`)
     : schema.notRequired().nullable()
 
-const getRange = (options) =>
-  options.split('..').map(option => parseFloat(option))
+const getRange = options => options?.split('..').map(option => parseFloat(option))
 
 const getValuesFromArray = (options, separator = ';') => options?.split(separator)
 
-const getOptionsFromList = (options, separator = ',') =>
-  options?.split(separator).map(value => ({ text: value, value }))
+const getOptionsFromList = options => options
+  ?.map(option => typeof option === 'string'
+    ? ({ text: option, value: option })
+    : option
+  )
+  ?.filter(({ text, value } = {}) => text && value)
 
 /**
  * @typedef {(