diff --git a/common/signal/timer.go b/common/signal/timer.go
index e33a43fba..21837027c 100644
--- a/common/signal/timer.go
+++ b/common/signal/timer.go
@@ -29,7 +29,9 @@ func (t *ActivityTimer) SetTimeout(timeout time.Duration) {
 
 func (t *ActivityTimer) run() {
 	ticker := time.NewTicker(<-t.timeout)
-	defer ticker.Stop()
+	defer func() {
+		ticker.Stop()
+	}()
 
 	for {
 		select {