diff --git a/cmd/handler-utils.go b/cmd/handler-utils.go
index 17a785708..591f826ce 100644
--- a/cmd/handler-utils.go
+++ b/cmd/handler-utils.go
@@ -156,7 +156,7 @@ func extractMetadataFromMap(ctx context.Context, v map[string][]string, m map[st
 			}
 			value, ok := v[key]
 			if ok {
-				m[key] = value[0]
+				m[key] = strings.Join(value, ",")
 				break
 			}
 		}