diff --git a/internal/query/milestone.go b/internal/query/milestone.go
index 8837bd8884..20567d0156 100644
--- a/internal/query/milestone.go
+++ b/internal/query/milestone.go
@@ -84,13 +84,15 @@ func (q *Queries) SearchMilestones(ctx context.Context, instanceIDs []string, qu
 	if err != nil {
 		return nil, err
 	}
+	defer func() {
+		if err = rows.Close(); err != nil {
+			err = errors.ThrowInternal(err, "QUERY-CK9mI", "Errors.Query.CloseRows")
+		}
+	}()
 	milestones, err := scan(rows)
 	if err != nil {
 		return nil, err
 	}
-	if err = rows.Close(); err != nil {
-		return nil, errors.ThrowInternal(err, "QUERY-CK9mI", "Errors.Query.CloseRows")
-	}
 	if err = rows.Err(); err != nil {
 		return nil, errors.ThrowInternal(err, "QUERY-asLsI", "Errors.Internal")
 	}