diff --git a/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx b/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx
index 0a127592c..20573bc63 100644
--- a/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx
+++ b/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx
@@ -12,10 +12,11 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@/components/ui/dialog";
-const QUEUED_LOG_MESSAGE = "Waiting for worker to pick job...";
 import { TerminalLine } from "../../docker/logs/terminal-line";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";
 
+const QUEUED_LOG_MESSAGE = "Waiting for worker to pick job...";
+
 interface Props {
 	logPath: string | null;
 	open: boolean;
diff --git a/apps/dokploy/components/dashboard/compose/general/actions.tsx b/apps/dokploy/components/dashboard/compose/general/actions.tsx
index 123dfc103..11e590713 100644
--- a/apps/dokploy/components/dashboard/compose/general/actions.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/actions.tsx
@@ -105,7 +105,10 @@ export const ComposeActions = ({ composeId }: Props) => {
 					>
 						<Button
 							variant="secondary"
-							isLoading={data?.composeStatus === "running"}
+							isLoading={
+								data?.composeStatus === "running" ||
+								data?.composeStatus === "queued"
+							}
 							className="flex items-center gap-1.5 group focus-visible:ring-2 focus-visible:ring-offset-2"
 						>
 							<Tooltip>
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx
index 8aee83e99..310ac4658 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx
@@ -127,7 +127,7 @@ export type Services = {
 	description?: string | null;
 	id: string;
 	createdAt: string;
-	status?: "idle" | "running" | "done" | "error" | "queued";
+	status?: "idle" | "queued" | "running" | "done" | "error";
 	lastDeployDate?: Date | null;
 	icon?: string | null;
 };
diff --git a/packages/server/src/utils/startup/cancel-deployments.ts b/packages/server/src/utils/startup/cancel-deployments.ts
index 80cfb3df6..92a685d65 100644
--- a/packages/server/src/utils/startup/cancel-deployments.ts
+++ b/packages/server/src/utils/startup/cancel-deployments.ts
@@ -22,10 +22,7 @@ export const initCancelDeployments = async () => {
 			.from(deployments)
 			.leftJoin(schedules, eq(deployments.scheduleId, schedules.scheduleId))
 			.where(
-				or(
-					eq(deployments.status, "running"),
-					eq(deployments.status, "queued"),
-				),
+				or(eq(deployments.status, "running"), eq(deployments.status, "queued")),
 			);
 
 		const deploymentIdsToCancel = runningDeployments
@@ -92,10 +89,7 @@ export const initCancelDeployments = async () => {
 				.update(previewDeployments)
 				.set({ previewStatus: "idle" })
 				.where(
-					inArray(
-						previewDeployments.previewDeploymentId,
-						previewDeploymentIds,
-					),
+					inArray(previewDeployments.previewDeploymentId, previewDeploymentIds),
 				);
 		}