diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
index 64f6672a8..5539146ee 100644
--- a/bazel/ray_deps_setup.bzl
+++ b/bazel/ray_deps_setup.bzl
@@ -191,6 +191,7 @@ def ray_deps_setup():
         remote = "https://github.com/grpc/grpc",
         sha256 = "723853c36ea6d179d32a4f9f2f8691dbe0e28d5bbc521c954b34355a1c952ba5",
         patches = [
+            "//thirdparty/patches:grpc-command-quoting.patch",
             "//thirdparty/patches:grpc-cython-copts.patch",
         ],
     )
diff --git a/thirdparty/patches/grpc-command-quoting.patch b/thirdparty/patches/grpc-command-quoting.patch
new file mode 100644
index 000000000..2cd7ff0fd
--- /dev/null
+++ b/thirdparty/patches/grpc-command-quoting.patch
@@ -0,0 +1,14 @@
+diff --git third_party/py/python_configure.bzl third_party/py/python_configure.bzl
+index 2cb84077e5..e733b9204e 100644
+--- third_party/py/python_configure.bzl
++++ third_party/py/python_configure.bzl
+@@ -190,7 +190,7 @@ def _get_python_lib(repository_ctx, python_bin, lib_path_key):
+         "for path in all_paths:\n" + "  if os.path.isdir(path):\n" +
+         "    paths.append(path)\n" + "if len(paths) >=1:\n" +
+         "  print(paths[0])\n" + "END")
+-    cmd = '%s - %s' % (python_bin, print_lib)
++    cmd = '"%s" - %s' % (python_bin, print_lib)
+     result = repository_ctx.execute([_get_bash_bin(repository_ctx), "-c", cmd])
+     return result.stdout.strip('\n')
+ 
+--