diff --git a/backend/cmd/sink/main.go b/backend/cmd/sink/main.go
index 25969146c..269b8fab0 100644
--- a/backend/cmd/sink/main.go
+++ b/backend/cmd/sink/main.go
@@ -30,7 +30,7 @@ func main() {
 	writer := oswriter.NewWriter(cfg.FsUlimit, cfg.FsDir)
 
 	producer := queue.NewProducer()
-	defer producer.Close(15000)
+	defer producer.Close(cfg.ProducerCloseTimeout)
 	rewriter := assets.NewRewriter(cfg.AssetsOrigin)
 	assetMessageHandler := assetscache.New(cfg, rewriter, producer)
 
diff --git a/backend/internal/config/sink/config.go b/backend/internal/config/sink/config.go
index be939df95..a78bfba63 100644
--- a/backend/internal/config/sink/config.go
+++ b/backend/internal/config/sink/config.go
@@ -5,25 +5,27 @@ import (
 )
 
 type Config struct {
-	FsDir        string
-	FsUlimit     uint16
-	GroupSink    string
-	TopicRawWeb  string
-	TopicRawIOS  string
-	TopicCache   string
-	CacheAssets  bool
-	AssetsOrigin string
+	FsDir                string
+	FsUlimit             uint16
+	GroupSink            string
+	TopicRawWeb          string
+	TopicRawIOS          string
+	TopicCache           string
+	CacheAssets          bool
+	AssetsOrigin         string
+	ProducerCloseTimeout int
 }
 
 func New() *Config {
 	return &Config{
-		FsDir:        env.String("FS_DIR"),
-		FsUlimit:     env.Uint16("FS_ULIMIT"),
-		GroupSink:    env.String("GROUP_SINK"),
-		TopicRawWeb:  env.String("TOPIC_RAW_WEB"),
-		TopicRawIOS:  env.String("TOPIC_RAW_IOS"),
-		TopicCache:   env.String("TOPIC_CACHE"),
-		CacheAssets:  env.Bool("CACHE_ASSETS"),
-		AssetsOrigin: env.String("ASSETS_ORIGIN"),
+		FsDir:                env.String("FS_DIR"),
+		FsUlimit:             env.Uint16("FS_ULIMIT"),
+		GroupSink:            env.String("GROUP_SINK"),
+		TopicRawWeb:          env.String("TOPIC_RAW_WEB"),
+		TopicRawIOS:          env.String("TOPIC_RAW_IOS"),
+		TopicCache:           env.String("TOPIC_CACHE"),
+		CacheAssets:          env.Bool("CACHE_ASSETS"),
+		AssetsOrigin:         env.String("ASSETS_ORIGIN"),
+		ProducerCloseTimeout: 15000,
 	}
 }