diff --git a/beam/tools/src/main/java/cz/o2/proxima/beam/tools/groovy/BeamStream.java b/beam/tools/src/main/java/cz/o2/proxima/beam/tools/groovy/BeamStream.java
index e4a13c4cd9..69e0438f07 100644
--- a/beam/tools/src/main/java/cz/o2/proxima/beam/tools/groovy/BeamStream.java
+++ b/beam/tools/src/main/java/cz/o2/proxima/beam/tools/groovy/BeamStream.java
@@ -1381,6 +1381,9 @@ public TypeDescriptor<Pair<K, V>> getOutputTypeDescriptor() {
   @VisibleForTesting
   static class ReduceValueStateByKey<K, V, S, O> extends DoFn<KV<K, V>, Pair<K, O>> {
 
+    private static final Instant MAX_ACCEPTABLE_STAMP =
+        BoundedWindow.TIMESTAMP_MAX_VALUE.minus(Duration.standardDays(300));
+
     static <K, V, S, O> ReduceValueStateByKey<K, V, S, O> of(
         Closure<S> initialState,
         Closure<S> stateUpdate,
@@ -1458,16 +1461,19 @@ public void processElement(
 
     @OnTimer("earlyTimer")
     public void onTimer(
-        OnTimerContext context,
+        @Timestamp Instant ts,
         @StateId("value") ValueState<Pair<K, S>> valueState,
-        @TimerId("earlyTimer") Timer earlyTimer) {
+        @TimerId("earlyTimer") Timer earlyTimer,
+        OutputReceiver<Pair<K, O>> collector) {
 
       Pair<K, S> current = Objects.requireNonNull(valueState.read());
       O outputElem = output.call(current.getSecond(), null);
       if (outputElem != null) {
-        context.output(Pair.of(current.getFirst(), outputElem));
+        collector.output(Pair.of(current.getFirst(), outputElem));
+      }
+      if (ts.isBefore(MAX_ACCEPTABLE_STAMP)) {
+        earlyTimer.offset(earlyEmitting).setRelative();
       }
-      earlyTimer.offset(earlyEmitting).setRelative();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/pom.xml b/pom.xml
index c05d0a5339..e86667d1b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -657,12 +657,30 @@
         <version>${grpc.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-api</artifactId>
+        <version>${grpc.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-protobuf</artifactId>
         <version>${grpc.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-context</artifactId>
+        <version>${grpc.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-census</artifactId>
+        <version>${grpc.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-stub</artifactId>