diff --git a/services/gateway/endpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/cloudevents/CloudEventsRoute.java b/services/gateway/endpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/cloudevents/CloudEventsRoute.java index f414edf485..e496c0ede2 100755 --- a/services/gateway/endpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/cloudevents/CloudEventsRoute.java +++ b/services/gateway/endpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/cloudevents/CloudEventsRoute.java @@ -249,9 +249,10 @@ private Optional> jsonToDittoSignal(@Nullable final CloudEventData dat .build(); final JsonifiableAdaptable jsonifiableAdaptable = ProtocolFactory.jsonifiableAdaptableFromJson(jsonObject); - return Optional.of(PROTOCOL_ADAPTER - .fromAdaptable(jsonifiableAdaptable) - .setDittoHeaders(adjustedHeaders)); + final Signal signal = PROTOCOL_ADAPTER.fromAdaptable(jsonifiableAdaptable); + final Signal signalWithAdjustedHeaders = signal.setDittoHeaders( + signal.getDittoHeaders().toBuilder().putHeaders(adjustedHeaders).build()); + return Optional.of(signalWithAdjustedHeaders); } private void ensureDataContentType(@Nullable final String dataContentType,