diff --git a/app/api/controller/pullreq/comment_create.go b/app/api/controller/pullreq/comment_create.go
index 20e154200..fcd769aee 100644
--- a/app/api/controller/pullreq/comment_create.go
+++ b/app/api/controller/pullreq/comment_create.go
@@ -417,10 +417,6 @@ func appendMetadataUpdateForSuggestions(
 	comment string,
 ) []types.PullReqActivityMetadataUpdate {
 	suggestions := parseSuggestions(comment)
-	if len(suggestions) == 0 {
-		return updates
-	}
-
 	return append(
 		updates,
 		types.WithPullReqActivitySuggestionsMetadataUpdate(
diff --git a/git/api/archive.go b/git/api/archive.go
index 5fcc29a6e..85c4b992c 100644
--- a/git/api/archive.go
+++ b/git/api/archive.go
@@ -103,6 +103,7 @@ func (p *ArchiveParams) Validate() error {
 	if p.Treeish == "" {
 		return errors.InvalidArgument("treeish field cannot be empty")
 	}
+	//nolint:revive
 	if err := p.Format.Validate(); err != nil {
 		return err
 	}
diff --git a/git/repo.go b/git/repo.go
index 13ed7b60a..fb0020499 100644
--- a/git/repo.go
+++ b/git/repo.go
@@ -546,7 +546,7 @@ func (p *ArchiveParams) Validate() error {
 	if err := p.ReadParams.Validate(); err != nil {
 		return err
 	}
-
+	//nolint:revive
 	if err := p.ArchiveParams.Validate(); err != nil {
 		return err
 	}
diff --git a/types/pullreq_activity.go b/types/pullreq_activity.go
index 24078eb17..011211e18 100644
--- a/types/pullreq_activity.go
+++ b/types/pullreq_activity.go
@@ -46,7 +46,7 @@ type PullReqActivity struct {
 
 	Text       string                   `json:"text"`
 	PayloadRaw json.RawMessage          `json:"payload"`
-	Metadata   *PullReqActivityMetadata `json:"metadata"`
+	Metadata   *PullReqActivityMetadata `json:"metadata,omitempty"`
 
 	ResolvedBy *int64 `json:"-"` // not returned, because the resolver info is in the Resolver field
 	Resolved   *int64 `json:"resolved,omitempty"`