diff --git a/portal-ui/src/screens/Console/Configurations/types.ts b/portal-ui/src/screens/Console/Configurations/types.ts
index d884c7335..5f3c7643e 100644
--- a/portal-ui/src/screens/Console/Configurations/types.ts
+++ b/portal-ui/src/screens/Console/Configurations/types.ts
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { SelectorTypes } from "../../../common/types";
+import { EnvOverride } from "../../../api/consoleApi";
 
 export type KVFieldType =
   | "string"
@@ -51,15 +52,10 @@ export interface IConfigurationElement {
   url?: string;
 }
 
-export interface IEnvOverride {
-  name: string;
-  value: string;
-}
-
 export interface IElementValue {
   key: string;
   value: string;
-  env_override?: IEnvOverride;
+  env_override?: EnvOverride;
 }
 
 export interface IConfigurationSys {
diff --git a/portal-ui/src/screens/Console/Configurations/utils.tsx b/portal-ui/src/screens/Console/Configurations/utils.tsx
index 1f30fd900..99a62e311 100644
--- a/portal-ui/src/screens/Console/Configurations/utils.tsx
+++ b/portal-ui/src/screens/Console/Configurations/utils.tsx
@@ -429,8 +429,8 @@ export const overrideFields = (formFields: IElementValue[]): IOverrideEnv => {
     // it has override values, we construct the value
     if (envItem.env_override) {
       const value: OverrideValue = {
-        value: envItem.env_override.value,
-        overrideEnv: envItem.env_override.name,
+        value: envItem.env_override.value || "",
+        overrideEnv: envItem.env_override.name || "",
       };
 
       overrideReturn = { ...overrideReturn, [envItem.key]: value };
diff --git a/portal-ui/src/screens/Console/EventDestinations/CustomForms/EditConfiguration.tsx b/portal-ui/src/screens/Console/EventDestinations/CustomForms/EditConfiguration.tsx
index 4655e66f2..cc2574a17 100644
--- a/portal-ui/src/screens/Console/EventDestinations/CustomForms/EditConfiguration.tsx
+++ b/portal-ui/src/screens/Console/EventDestinations/CustomForms/EditConfiguration.tsx
@@ -91,7 +91,7 @@ const EditConfiguration = ({
 
             const fieldsConfig: KVField[] = fieldsConfigurations[configId];
 
-            const keyVals = fieldsConfig.map((field) => {
+            const keyVals: IElementValue[] = fieldsConfig.map((field) => {
               const includedValue = values.find(
                 (element: ConfigurationKV) => element.key === field.name,
               );
@@ -102,6 +102,7 @@ const EditConfiguration = ({
                 value: field.customValueProcess
                   ? field.customValueProcess(customValue)
                   : customValue,
+                env_override: includedValue?.env_override,
               };
             });