diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 8102f449285790..bd9fa1bd91c040 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -21,11 +21,11 @@ vcpkg_from_github(
         00012-fix-use-cxx17.patch
 )
 
-if(TARGET_TRIPLET STREQUAL HOST_TRIPLET)
-    set(gRPC_BUILD_CODEGEN ON)
-else()
+if((NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
     set(gRPC_BUILD_CODEGEN OFF)
     vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
+else()
+    set(gRPC_BUILD_CODEGEN ON)
 endif()
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME)
diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json
index a639cdccbdec34..5a61f9ae5178d8 100644
--- a/ports/grpc/vcpkg.json
+++ b/ports/grpc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "grpc",
   "version-string": "1.33.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "An RPC library and framework",
   "homepage": "https://github.com/grpc/grpc",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 8ec59ecb7fabce..f3938e44e9bbfe 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2346,7 +2346,7 @@
     },
     "grpc": {
       "baseline": "1.33.1",
-      "port-version": 3
+      "port-version": 4
     },
     "grppi": {
       "baseline": "0.4.0",
diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json
index 9d5f0da112fdbc..d471a4f95964db 100644
--- a/versions/g-/grpc.json
+++ b/versions/g-/grpc.json
@@ -1,7 +1,12 @@
 {
   "versions": [
     {
-      "git-tree": "1d0adf4a9c4f719dd9d0d22dd2bd58ba34ff921c",
+      "git-tree": "59fb7c6053bb8e085c90d753e2fd63f21fd61220",
+      "version-string": "1.33.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "b379f5dcd4dffcdd3507789365e357941e638b22",
       "version-string": "1.33.1",
       "port-version": 3
     },