diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go
index a39818a1bc..489860dd4e 100644
--- a/libpod/events/logfile.go
+++ b/libpod/events/logfile.go
@@ -122,9 +122,15 @@ func (e EventLogFile) Read(ctx context.Context, options ReadOptions) error {
 			return err
 		}
 		go func() {
-			time.Sleep(time.Until(untilTime))
-			if err := t.Stop(); err != nil {
-				logrus.Errorf("Stopping logger: %v", err)
+			timer := time.NewTimer(time.Until(untilTime))
+			defer timer.Stop()
+			select {
+			case <-timer.C:
+				if err := t.Stop(); err != nil {
+					logrus.Errorf("Stopping logger: %v", err)
+				}
+			case <-ctx.Done():
+				return
 			}
 		}()
 	}