From c77f6d889d088fff01790db2d59c107c1abdb4e5 Mon Sep 17 00:00:00 2001
From: Thai Nguyen <thai.nguyen@techcoop.vn>
Date: Tue, 18 Aug 2026 17:34:18 +0700
Subject: [PATCH] fix: clear stale stack log container selection

---
 .../dashboard/compose/logs/show-stack.tsx     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx b/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx
index 8b46b0666..68b0868fc 100644
--- a/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx
+++ b/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx
@@ -74,15 +74,16 @@ export const ShowDockerLogsStack = ({
 	useEffect(() => {
 		const currentContainers = option === "native" ? containers : services;
 
-		if (
-			currentContainers &&
-			currentContainers.length > 0 &&
-			(!containerId ||
-				!currentContainers.some(
-					(container) => container.containerId === containerId,
-				))
-		) {
-			setContainerId(currentContainers[0]?.containerId);
+		if (currentContainers) {
+			const nextContainerId = currentContainers.some(
+				(container) => container.containerId === containerId,
+			)
+				? containerId
+				: currentContainers[0]?.containerId;
+
+			if (nextContainerId !== containerId) {
+				setContainerId(nextContainerId);
+			}
 		}
 	}, [option, services, containers, containerId]);