diff --git a/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx b/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
index c0504ab4..fb9a3aeb 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
@@ -132,7 +132,7 @@ TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_HTTP_CHALLENGE_DNS_PROVIDER=cloudflare
 					<DialogFooter>
 						<Button
 							isLoading={isLoading}
-							disabled={canEdit}
+							disabled={canEdit || isLoading}
 							form="hook-form-update-server-traefik-config"
 							type="submit"
 						>
diff --git a/apps/dokploy/server/setup/traefik-setup.ts b/apps/dokploy/server/setup/traefik-setup.ts
index afebf07e..15542a00 100644
--- a/apps/dokploy/server/setup/traefik-setup.ts
+++ b/apps/dokploy/server/setup/traefik-setup.ts
@@ -1,6 +1,6 @@
 import { chmodSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
 import path from "node:path";
-import type { CreateServiceOptions } from "dockerode";
+import type { ContainerTaskSpec, CreateServiceOptions } from "dockerode";
 import { dump } from "js-yaml";
 import { DYNAMIC_TRAEFIK_PATH, MAIN_TRAEFIK_PATH, docker } from "../constants";
 import { pullImage } from "../utils/docker/utils";
@@ -18,7 +18,7 @@ interface TraefikOptions {
 
 export const initializeTraefik = async ({
 	enableDashboard = false,
-	env = [],
+	env,
 }: TraefikOptions = {}) => {
 	const imageName = "traefik:v2.5";
 	const containerName = "dokploy-traefik";
@@ -85,9 +85,23 @@ export const initializeTraefik = async ({
 
 		const service = docker.getService(containerName);
 		const inspect = await service.inspect();
+
+		const existingEnv = inspect.Spec.TaskTemplate.ContainerSpec.Env || [];
+		const updatedEnv = !env ? existingEnv : env;
+
+		const updatedSettings = {
+			...settings,
+			TaskTemplate: {
+				...settings.TaskTemplate,
+				ContainerSpec: {
+					...(settings?.TaskTemplate as ContainerTaskSpec).ContainerSpec,
+					Env: updatedEnv,
+				},
+			},
+		};
 		await service.update({
 			version: Number.parseInt(inspect.Version.Index),
-			...settings,
+			...updatedSettings,
 		});
 
 		console.log("Traefik Started ✅");