diff --git a/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js b/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js
index 4fb8a5abc..284019177 100644
--- a/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js
+++ b/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js
@@ -13,6 +13,7 @@ import { StackType } from '@/react/common/stacks/types';
 import { applySetStateAction } from '@/react-tools/apply-set-state-action';
 import { getVariablesFieldDefaultValues } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesField';
 import { renderTemplate } from '@/react/portainer/custom-templates/components/utils';
+import { getInitialTemplateValues } from '@/react/edge/edge-stacks/CreateView/TemplateFieldset';
 
 export default class CreateEdgeStackViewController {
   /* @ngInject */
@@ -50,11 +51,7 @@ export default class CreateEdgeStackViewController {
       endpointTypes: [],
       baseWebhookUrl: baseEdgeStackWebhookUrl(),
       isEdit: false,
-      templateValues: {
-        template: null,
-        variables: [],
-        file: '',
-      },
+      templateValues: getInitialTemplateValues(),
     };
 
     this.edgeGroups = null;
@@ -328,6 +325,7 @@ export default class CreateEdgeStackViewController {
       this.formValues.DeploymentType = deploymentType;
       this.state.Method = 'editor';
       this.formValues.StackFileContent = '';
+      this.state.templateValues = getInitialTemplateValues();
     });
   }
 
diff --git a/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.controller.js b/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.controller.js
index 915815783..859bd0207 100644
--- a/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.controller.js
+++ b/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.controller.js
@@ -1,3 +1,4 @@
+import { getInitialTemplateValues } from '@/react/edge/edge-stacks/CreateView/TemplateFieldset';
 import { editor, git, edgeStackTemplate, upload } from '@@/BoxSelector/common-options/build-methods';
 
 class DockerComposeFormController {
@@ -25,6 +26,7 @@ class DockerComposeFormController {
   onChangeMethod(method) {
     this.state.Method = method;
     this.formValues.StackFileContent = '';
+    this.setTemplateValues(getInitialTemplateValues());
   }
 
   onChangeFileContent(value) {
diff --git a/app/react/edge/edge-stacks/CreateView/TemplateFieldset.tsx b/app/react/edge/edge-stacks/CreateView/TemplateFieldset.tsx
index 508037a70..1f1bd2de7 100644
--- a/app/react/edge/edge-stacks/CreateView/TemplateFieldset.tsx
+++ b/app/react/edge/edge-stacks/CreateView/TemplateFieldset.tsx
@@ -137,3 +137,11 @@ function TemplateSelector({
     onChange(value);
   }
 }
+
+export function getInitialTemplateValues() {
+  return {
+    template: null,
+    variables: [],
+    file: '',
+  };
+}