diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentTab.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentTab.tsx
index 27c46357a..8dbafa540 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentTab.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentTab.tsx
@@ -59,7 +59,7 @@ export function EdgeAgentTab({
   );
 
   function handleCreate(environment: Environment) {
-    setEdgeInfo({ key: environment.EdgeKey, id: uuid() });
+    setEdgeInfo({ key: environment.EdgeKey, id: environment.EdgeID || uuid() });
     onCreate(environment);
   }