diff --git a/common/signal/timer.go b/common/signal/timer.go
index 5c2407f7..bc2a0bd1 100644
--- a/common/signal/timer.go
+++ b/common/signal/timer.go
@@ -39,6 +39,11 @@ func (t *ActivityTimer) run() {
 		case <-t.ctx.Done():
 			return
 		case timeout := <-t.timeout:
+			if timeout == 0 {
+				t.cancel()
+				return
+			}
+
 			ticker.Stop()
 			ticker = time.NewTicker(timeout)
 		}