diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java
index d7e93f79..203de59f 100644
--- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java
+++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java
@@ -28,6 +28,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.mail.MailProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.dsl.core.Pollers;
@@ -41,6 +42,7 @@ import org.springframework.integration.file.support.FileExistsMode;
 import org.springframework.integration.ftp.session.DefaultFtpSessionFactory;
 import org.springframework.integration.http.config.EnableIntegrationGraphController;
 import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.MessagingException;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -69,8 +71,7 @@ public class Application {
 	public IntegrationFlow fromFile() {
 		return IntegrationFlows.from(Files.inboundAdapter(new File("/tmp/in"))
 					.preventDuplicates(false)
-					.patternFilter("*.txt"), e -> e.poller(Pollers.fixedDelay(5000)))
-				.enrichHeaders(h -> h.header(MessageHeaders.ERROR_CHANNEL, "tfrErrors.input"))
+					.patternFilter("*.txt"), e -> e.poller(Pollers.fixedDelay(5000).errorChannel(tfrErrorChannel())))
 				.handle(Files.splitter(true, true))
 				.<Object, Class<?>>route(Object::getClass, m -> m
 						.channelMapping(FileSplitter.FileMarker.class, "markers.input")
@@ -163,13 +164,19 @@ public class Application {
 		return ftp;
 	}
 
+	@Bean
+	public MessageChannel tfrErrorChannel() {
+		return new DirectChannel();
+	}
+
 	/**
 	 * Error flow - email failure
 	 * @return the flow.
 	 */
 	@Bean
 	public IntegrationFlow tfrErrors() {
-		return f -> f.enrichHeaders(Mail.headers()
+		return IntegrationFlows.from(tfrErrorChannel())
+				.enrichHeaders(Mail.headers()
 					.subject("File split and transfer failed")
 					.from("foo@bar")
 					.toFunction(m -> new String[] {"bar@baz"}))
@@ -178,7 +185,8 @@ public class Application {
 								+ FileHeaders.ORIGINAL_FILE + "']"))
 				.<MessagingException, String>transform(p ->
 						p.getFailedMessage().getPayload().toString() + "\n" + getStackTraceAsString(p))
-				.channel("toMail.input");
+				.channel("toMail.input")
+				.get();
 	}
 
 	@Bean