diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index d83eff9bf8..cd65c0e49e 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -2625,6 +2625,8 @@ spoe_stop_processing(struct spoe_agent *agent, struct spoe_context *ctx)
 
 	/* Reset processing timer */
 	ctx->process_exp = TICK_ETERNITY;
+	ctx->strm->req.analyse_exp = TICK_ETERNITY;
+	ctx->strm->res.analyse_exp = TICK_ETERNITY;
 
 	spoe_release_buffer(&ctx->buffer, &ctx->buffer_wait);
 
@@ -2683,8 +2685,10 @@ spoe_process_messages(struct stream *s, struct spoe_context *ctx,
 
 		if (!tick_isset(ctx->process_exp)) {
 			ctx->process_exp = tick_add_ifset(now_ms, agent->timeout.processing);
-			s->task->expire  = tick_first((tick_is_expired(s->task->expire, now_ms) ? 0 : s->task->expire),
-						      ctx->process_exp);
+			if (dir == SMP_OPT_DIR_REQ)
+				s->req.analyse_exp = ctx->process_exp;
+			else
+				s->res.analyse_exp = ctx->process_exp;
 		}
 		ret = spoe_start_processing(agent, ctx, dir);
 		if (!ret)