diff --git a/pkg/pipeline/sink/image.go b/pkg/pipeline/sink/image.go
index 736371de..34df0efe 100644
--- a/pkg/pipeline/sink/image.go
+++ b/pkg/pipeline/sink/image.go
@@ -54,6 +54,7 @@ type imageUpdate struct {
 }
 
 func newImageSink(u uploader.Uploader, p *config.PipelineConfig, o *config.ImageConfig, callbacks *gstreamer.Callbacks) (*ImageSink, error) {
+	maxPendingUploads := 900 / o.CaptureInterval
 	return &ImageSink{
 		Uploader:    u,
 		ImageConfig: o,
diff --git a/pkg/pipeline/sink/segments.go b/pkg/pipeline/sink/segments.go
index 784a704b..7c4ec055 100644
--- a/pkg/pipeline/sink/segments.go
+++ b/pkg/pipeline/sink/segments.go
@@ -35,7 +35,6 @@ import (
 )
 
 const (
-	maxPendingUploads         = 100
 	defaultLivePlaylistWindow = 5
 )
 
@@ -91,6 +90,7 @@ func newSegmentSink(u uploader.Uploader, p *config.PipelineConfig, o *config.Seg
 		outputType = types.OutputTypeTS
 	}
 
+	maxPendingUploads := 900 / o.SegmentDuration
 	s := &SegmentSink{
 		Uploader:              u,
 		SegmentConfig:         o,