diff --git a/api/internal/genapi/parse.go b/api/internal/genapi/parse.go
index 75abfbe671..2f0cc93666 100644
--- a/api/internal/genapi/parse.go
+++ b/api/internal/genapi/parse.go
@@ -116,7 +116,11 @@ func parsePBs() {
 				var selectorExpr *ast.SelectorExpr
 				switch typ := field.Type.(type) {
 				case *ast.Ident:
-					typ.Name = "*" + typ.Name
+					// Id values are immutable and should always exist, so
+					// don't make it a pointer
+					if field.Names[0].Name != "Id" {
+						typ.Name = "*" + typ.Name
+					}
 					goto TAGMODIFY
 				case *ast.ArrayType:
 					goto TAGMODIFY