diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
index 251bd88931..5fbb9ead26 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
@@ -113,7 +113,7 @@ public class NativeMessageHeaderAccessor extends MessageHeaderAccessor {
 	public void setHeader(String name, @Nullable Object value) {
 		if (name.equalsIgnoreCase(NATIVE_HEADERS)) {
 			// Force removal since setHeader checks for equality
-			removeHeader(NATIVE_HEADERS);
+			super.setHeader(NATIVE_HEADERS, null);
 		}
 		super.setHeader(name, value);
 	}