diff --git a/syncapi/storage/shared/stream.go b/syncapi/storage/shared/stream.go
index 8ba68dbe8..76c5acf38 100644
--- a/syncapi/storage/shared/stream.go
+++ b/syncapi/storage/shared/stream.go
@@ -75,6 +75,7 @@ func (p *StreamProvider) NotifyAfter(
 			case <-ctx.Done():
 				// The context has expired, so there's no point
 				// in continuing to wait for the update.
+				close(ch)
 				return
 			default:
 				// The latest position has been advanced. Let's
diff --git a/syncapi/storage/shared/streamlog.go b/syncapi/storage/shared/streamlog.go
index f167108db..a3d8e2a53 100644
--- a/syncapi/storage/shared/streamlog.go
+++ b/syncapi/storage/shared/streamlog.go
@@ -75,6 +75,7 @@ func (p *StreamLogProvider) NotifyAfter(
 			case <-ctx.Done():
 				// The context has expired, so there's no point
 				// in continuing to wait for the update.
+				close(ch)
 				return
 			default:
 				// The latest position has been advanced. Let's