diff --git a/events.go b/events.go
index df03c99..085bb65 100644
--- a/events.go
+++ b/events.go
@@ -19,15 +19,13 @@ func enableHasuraEventCleaner() {
 		defer ticker.Stop()
 		cfg.Logger.Info("Event cleaner enabled", map[string]interface{}{"interval_in_days": cfg.HasuraEventCleaner.ClearOlderThan})
 
-		go func() {
-			for {
-				select {
-				case <-ticker.C:
-					cfg.Logger.Info("Cleaning up old events", nil)
-					cleanEvents()
-				}
+		for {
+			select {
+			case <-ticker.C:
+				cfg.Logger.Info("Cleaning up old events", nil)
+				cleanEvents()
 			}
-		}()
+		}
 	}
 }