diff --git a/node/cmd/guardiand/adminclient.go b/node/cmd/guardiand/adminclient.go
index 10c18a9195..cf805323fa 100644
--- a/node/cmd/guardiand/adminclient.go
+++ b/node/cmd/guardiand/adminclient.go
@@ -349,9 +349,8 @@ func runDumpVAAByMessageID(cmd *cobra.Command, args []string) {
 	if err != nil {
 		log.Fatalf("invalid chain ID: %v", err)
 	}
-	// We only constrain this to int32 now, not uint16, given the ChainID protobuf definition
-	if chainID > math.MaxInt32 {
-		log.Fatalf("chain id must not exceed the max int32: %v", chainID)
+	if chainID > math.MaxUint16 {
+		log.Fatalf("chain id must not exceed the max uint16: %v", chainID)
 	}
 	emitterAddress := parts[1]
 	seq, err := strconv.ParseUint(parts[2], 10, 64)
diff --git a/node/pkg/watchers/near/watcher_test.go b/node/pkg/watchers/near/watcher_test.go
index d897a48a8c..5af0740207 100644
--- a/node/pkg/watchers/near/watcher_test.go
+++ b/node/pkg/watchers/near/watcher_test.go
@@ -589,7 +589,7 @@ func TestSuccessValueToInt(t *testing.T) {
 
 	type test struct {
 		input  string
-		output int
+		output uint64
 	}
 
 	testsPositive := []test{