diff --git a/app/react/portainer/environments/wizard/HomeView/HomeView.tsx b/app/react/portainer/environments/wizard/HomeView/HomeView.tsx
index 9069bc798..28ddb5698 100644
--- a/app/react/portainer/environments/wizard/HomeView/HomeView.tsx
+++ b/app/react/portainer/environments/wizard/HomeView/HomeView.tsx
@@ -103,6 +103,8 @@ function getTypeLabel(type?: EnvironmentType) {
   switch (type) {
     case EnvironmentType.Docker:
       return 'Docker';
+    case EnvironmentType.AgentOnDocker:
+      return 'Docker Agent';
     case EnvironmentType.KubernetesLocal:
       return 'Kubernetes';
     default:
diff --git a/app/react/portainer/environments/wizard/HomeView/useFetchOrCreateLocalEnvironment.ts b/app/react/portainer/environments/wizard/HomeView/useFetchOrCreateLocalEnvironment.ts
index 6437472a8..f718c9fed 100644
--- a/app/react/portainer/environments/wizard/HomeView/useFetchOrCreateLocalEnvironment.ts
+++ b/app/react/portainer/environments/wizard/HomeView/useFetchOrCreateLocalEnvironment.ts
@@ -74,7 +74,11 @@ function useFetchLocalEnvironment() {
     {
       page: 0,
       pageLimit: 1,
-      types: [EnvironmentType.Docker, EnvironmentType.KubernetesLocal],
+      types: [
+        EnvironmentType.Docker,
+        EnvironmentType.AgentOnDocker,
+        EnvironmentType.KubernetesLocal,
+      ],
     },
     {
       refetchInterval: false,
@@ -82,8 +86,21 @@ function useFetchLocalEnvironment() {
     }
   );
 
+  let environment: Environment | undefined;
+  environments.forEach((value) => {
+    if (!environment) {
+      if (value.Type === EnvironmentType.AgentOnDocker) {
+        if (value.Name === 'primary' && value.Id === 1) {
+          environment = value;
+        }
+      } else {
+        environment = value;
+      }
+    }
+  });
+
   return {
     isLoading,
-    environment: environments.length > 0 ? environments[0] : undefined,
+    environment,
   };
 }