Back-port of: https://github.com/spring-projects/spring-integration/issues/10100 Fixed via: https://github.com/spring-projects/spring-integration/commit/ac20fce67340d966fabd755baa2502e678514ec9