diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java
index fb5bdfd13..6ca3fd3ec 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java
@@ -65,6 +65,8 @@ public abstract class MaxWaitTimeOperator extends BaseOperator<Condition> {
         timeoutCondition.addExecutable(executable);
         timeoutCondition.setMaxWaitTime(maxWaitTime);
         timeoutCondition.setMaxWaitTimeUnit(getMaxWaitTimeUnit());
+        timeoutCondition.setId(executable.getId());
+        timeoutCondition.setTag(executable.getTag());
         return timeoutCondition;
     }
 
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java
index 611e39c17..1976909bf 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java
@@ -111,6 +111,11 @@ public class MaxWaitSecondsELSpringbootTest extends BaseTest {
         assertNotTimeout("switch2");
     }
 
+    @Test
+    public void testSwitch3() {
+        assertNotTimeout("switch3");
+    }
+
     // 测试 IF 的超时情况
     @Test
     public void testIf1() {
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml
index 17edf5a01..e8b8d3442 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml
@@ -62,6 +62,11 @@
         SWITCH(s).TO(a, b).maxWaitSeconds(3);
     </chain>
 
+    <chain name="switch3">
+        <!-- 不超时 -->
+        SWITCH(s).TO(a.maxWaitSeconds(3), b.maxWaitSeconds(2));
+    </chain>
+
     <!-- 条件编排测试 -->
     <!-- f 返回 true -->
     <chain name="if1">