diff --git a/pkg/tls/ocsp.go b/pkg/tls/ocsp.go
index 1517458ae..2df703fb0 100644
--- a/pkg/tls/ocsp.go
+++ b/pkg/tls/ocsp.go
@@ -49,15 +49,17 @@ func (o *ocspStapler) Run(ctx context.Context) {
 	ticker := time.NewTicker(time.Hour)
 	defer ticker.Stop()
 
-	select {
-	case <-ctx.Done():
-		return
+	for {
+		select {
+		case <-ctx.Done():
+			return
 
-	case <-o.forceStapleUpdates:
-		o.updateStaples(ctx)
+		case <-o.forceStapleUpdates:
+			o.updateStaples(ctx)
 
-	case <-ticker.C:
-		o.updateStaples(ctx)
+		case <-ticker.C:
+			o.updateStaples(ctx)
+		}
 	}
 }