diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx
index 4d9e7850a6..5958a9a6ff 100644
--- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx
+++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx
@@ -114,9 +114,9 @@ export const FeatureStrategyCreate = () => {
         refetchChangeRequests();
     };
 
-    const onSubmit = async () => {
-        const payload = createStrategyPayload(strategy, segments);
+    const payload = createStrategyPayload(strategy, segments);
 
+    const onSubmit = async () => {
         trackEvent('strategyTitle', {
             props: {
                 hasTitle: Boolean(strategy.title),
@@ -153,7 +153,7 @@ export const FeatureStrategyCreate = () => {
                     projectId,
                     featureId,
                     environmentId,
-                    strategy,
+                    payload,
                     unleashUrl
                 )
             }
diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEdit/FeatureStrategyEdit.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEdit/FeatureStrategyEdit.tsx
index 18febe0d87..f025432d42 100644
--- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEdit/FeatureStrategyEdit.tsx
+++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEdit/FeatureStrategyEdit.tsx
@@ -94,6 +94,9 @@ export const FeatureStrategyEdit = () => {
         savedStrategySegments && setSegments(savedStrategySegments);
     }, [JSON.stringify(savedStrategySegments)]);
 
+    const segmentsToSubmit = uiConfig?.flags.SE ? segments : [];
+    const payload = createStrategyPayload(strategy, segmentsToSubmit);
+
     const onStrategyEdit = async (payload: IFeatureStrategyPayload) => {
         await updateStrategyOnFeature(
             projectId,
@@ -134,9 +137,6 @@ export const FeatureStrategyEdit = () => {
     };
 
     const onSubmit = async () => {
-        const segmentsToSubmit = uiConfig?.flags.SE ? segments : [];
-        const payload = createStrategyPayload(strategy, segmentsToSubmit);
-
         try {
             if (isChangeRequestConfigured(environmentId)) {
                 await onStrategyRequestEdit(payload);
@@ -168,7 +168,7 @@ export const FeatureStrategyEdit = () => {
                     projectId,
                     featureId,
                     environmentId,
-                    strategy,
+                    payload,
                     strategyDefinition,
                     unleashUrl
                 )