diff --git a/pom.xml b/pom.xml
index 1124f2c..cd08e2a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<artifactId>lm-lib</artifactId>
 	<groupId>de.extio</groupId>
 	<name>lm-lib</name>
-	<version>2.4.1</version>
+	<version>2.4.2</version>
 	
 	<properties>
 		<java.version>25</java.version>
diff --git a/src/main/java/de/extio/lmlib/agent/AgentContext.java b/src/main/java/de/extio/lmlib/agent/AgentContext.java
index 80f3646..ab198af 100755
--- a/src/main/java/de/extio/lmlib/agent/AgentContext.java
+++ b/src/main/java/de/extio/lmlib/agent/AgentContext.java
@@ -41,6 +41,8 @@ public final class AgentContext {
 	// Internal
 	
 	private final Map<String, ? extends BaseAgent> agents;
+
+	private volatile String currentAgentName;
 	
 	private volatile AgentNext nextAgent;
 	
@@ -260,4 +262,12 @@ public final class AgentContext {
 	public void setStreaming(final boolean streaming) {
 		this.streaming = streaming;
 	}
+	
+	public String getCurrentAgentName() {
+		return currentAgentName;
+	}
+
+	public void setCurrentAgentName(final String currentAgentName) {
+		this.currentAgentName = currentAgentName;
+	}
 }
diff --git a/src/main/java/de/extio/lmlib/agent/BaseAgent.java b/src/main/java/de/extio/lmlib/agent/BaseAgent.java
index c652aab..f3e57e7 100644
--- a/src/main/java/de/extio/lmlib/agent/BaseAgent.java
+++ b/src/main/java/de/extio/lmlib/agent/BaseAgent.java
@@ -80,6 +80,7 @@ public interface BaseAgent {
 	default List<AgentContext> execute(final Client client, final ExecutorService agentExecutorService, final AgentContext context) {
 		final var splits = new ArrayList<Split>();
 		
+		context.setCurrentAgentName(this.name());
 		context.setNextAgent(null);
 		context.clearError();
 		
@@ -94,6 +95,7 @@ public interface BaseAgent {
 			context.setError(AgentErrorType.GENERAL, ex);
 			return List.of(context);
 		}
+		final boolean skipCompletion = context.isSkipNextCompletion();
 
 		splits.addAll(this.applyTemplate(context));
 		final var tasks = new ArrayList<CompletableFuture<?>>(splits.size());
@@ -101,8 +103,8 @@ public interface BaseAgent {
 			tasks.add(CompletableFuture.runAsync(() -> {
 				try {
 					split.context().clearError();
-					final boolean skipCompletion = split.context().isSkipNextCompletion() || this.agentType(split.context()) == AgentType.PROCESSING_ONLY;
-					if (skipCompletion) {
+					final boolean skipCompletionInSplit = skipCompletion || this.agentType(split.context()) == AgentType.PROCESSING_ONLY;
+					if (skipCompletionInSplit) {
 						split.context().setSkipNextCompletion(false);
 						split.context().getGraph().add("○");
 					}
@@ -112,7 +114,7 @@ public interface BaseAgent {
 					}
 					split.context().getGraph().add(this.name());
 					
-					if (!skipCompletion) {
+					if (!skipCompletionInSplit) {
 						final boolean skipCache = split.context().isSkipCache() || split.context().isAlwaysSkipCache();
 						split.context().setSkipCache(false);
 						final var conversation = this.setupConversation(split);
@@ -218,7 +220,7 @@ public interface BaseAgent {
 				}
 			}
 			
-			retContexts.forEach(this::nextAgent);
+			retContexts.forEach(ctx -> this.nextAgent(ctx, skipCompletion));
 		}
 		
 		retContexts.addAll(splits.stream().filter(s -> s.context().isError()).map(s -> s.context()).toList());
@@ -357,7 +359,7 @@ public interface BaseAgent {
 		return conversation;
 	}
 	
-	private void nextAgent(final AgentContext context) {
+	private void nextAgent(final AgentContext context, final boolean skipCompletion) {
 		context.setNextAgent(this.chooseNextAgent(context));
 		
 		if (context.getNextAgent() != null) {
@@ -400,7 +402,8 @@ public interface BaseAgent {
 					}
 					else {
 						context.getGraph().add("↴");
-						if (context.getConversation().getConversation().getLast().type() != TurnType.ASSISTANT) {
+						final var currentAgent = context.getAgents().get(context.getCurrentAgentName());
+						if (! skipCompletion && currentAgent.agentType(context) != AgentType.PROCESSING_ONLY && context.getConversation().getConversation().getLast().type() != TurnType.ASSISTANT) {
 							context.getConversation().addTurn(new Conversation.Turn(TurnType.ASSISTANT, context.getLastCompletion().response()));
 						}
 					}