diff --git a/src/main/java/de/telekom/horizon/pulsar/service/EventMessageSupplier.java b/src/main/java/de/telekom/horizon/pulsar/service/EventMessageSupplier.java
index f13ec7b..fbe871d 100644
--- a/src/main/java/de/telekom/horizon/pulsar/service/EventMessageSupplier.java
+++ b/src/main/java/de/telekom/horizon/pulsar/service/EventMessageSupplier.java
@@ -129,9 +129,7 @@ public EventMessageContext get() {
                         throw new SubscriberDoesNotMatchSubscriptionException(errorMessage);
                     }
 
-                    if (StringUtils.isNotEmpty(currentOffset)) {
-                        Optional.ofNullable(message.getHttpHeaders()).ifPresent(headers -> headers.put("x-pubsub-offset-id", new ArrayList<>(List.of(currentOffset))));
-                    }
+                    Optional.ofNullable(message.getHttpHeaders()).ifPresent(headers -> headers.put("x-pubsub-offset-id", new ArrayList<>(List.of(state.getUuid()))));
                 }
                 return new EventMessageContext(message, includeHttpHeaders, streamLimit, ignoreDeduplication, span, spanInScope);
             } catch (CouldNotPickMessageException | SubscriberDoesNotMatchSubscriptionException e) {