diff --git a/.flake8 b/.flake8
index 28472d49..2de01f9d 100644
--- a/.flake8
+++ b/.flake8
@@ -3,6 +3,6 @@ per-file-ignores =
   *.py: E203, E301, E302, E305, E501
   *.pyi: E301, E302, E305, E501, E701, E741, F401, F403, F405, F822, Y037
   *_pb2.pyi: E301, E302, E305, E501, E701, E741, F401, F403, F405, F822, Y037, Y021
-  *_pb2_grpc.pyi: E301, E302, E305, E501, E701, E741, F401, F403, F405, F822, Y037, Y021
+  *_pb2_grpc.pyi: E301, E302, E305, E501, E701, E741, F401, F403, F405, F822, Y037, Y021, Y023
 
 extend_exclude = venv*,*_pb2.py,*_pb2_grpc.py,build/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f45f6882..af53d271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 - Mark top-level mangled identifiers as `TypeAlias`.
 - Change the top-level mangling prefix from `global___` to `Global___` to respect
-  [Y042](https://github.com/PyCQA/flake8-pyi/blob/main/ERRORCODES.md#list-of-warnings) naming convention. 
+  [Y042](https://github.com/PyCQA/flake8-pyi/blob/main/ERRORCODES.md#list-of-warnings) naming convention.
+- Support client stub async typing overloads
 
 ## 3.6.0
 
diff --git a/README.md b/README.md
index fecb15f3..e9aa4ecb 100644
--- a/README.md
+++ b/README.md
@@ -303,6 +303,7 @@ black .
 - [@fergyfresh](https://github.com/fergyfresh)
 - [@AlexWaygood](https://github.com/AlexWaygood)
 - [@Avasam](https://github.com/Avasam)
+- [@artificial-aidan](https://github.com/artificial-aidan)
 
 ## Licence etc.
 
diff --git a/mypy_protobuf/main.py b/mypy_protobuf/main.py
index 44149777..0954ea71 100644
--- a/mypy_protobuf/main.py
+++ b/mypy_protobuf/main.py
@@ -13,8 +13,8 @@
     Iterator,
     List,
     Optional,
-    Set,
     Sequence,
+    Set,
     Tuple,
 )
 
@@ -22,6 +22,7 @@
 from google.protobuf.compiler import plugin_pb2 as plugin_pb2
 from google.protobuf.internal.containers import RepeatedCompositeFieldContainer
 from google.protobuf.internal.well_known_types import WKTBASES
+
 from . import extensions_pb2
 
 __version__ = "3.6.0"
@@ -85,6 +86,11 @@
 }
 
 
+def _build_typevar_name(service_name: str, method_name: str) -> str:
+    # Prefix with underscore to avoid public api error: https://stackoverflow.com/a/78871465
+    return f"_{service_name}{method_name}Type"
+
+
 def _mangle_global_identifier(name: str) -> str:
     """
     Module level identifiers are mangled and aliased so that they can be disambiguated
@@ -168,9 +174,7 @@ def _import(self, path: str, name: str) -> str:
         eg. self._import("typing", "Literal") -> "Literal"
         """
         if path == "typing_extensions":
-            stabilization = {
-                "TypeAlias": (3, 10),
-            }
+            stabilization = {"TypeAlias": (3, 10), "TypeVar": (3, 13)}
             assert name in stabilization
             if not self.typing_extensions_min or self.typing_extensions_min < stabilization[name]:
                 self.typing_extensions_min = stabilization[name]
@@ -732,6 +736,46 @@ def write_grpc_async_hacks(self) -> None:
             wl("...")
         wl("")
 
+    def write_grpc_type_vars(self, service: d.ServiceDescriptorProto) -> None:
+        wl = self._write_line
+        methods = [(i, m) for i, m in enumerate(service.method) if m.name not in PYTHON_RESERVED]
+        if not methods:
+            return
+        for _, method in methods:
+            wl("{} = {}(", _build_typevar_name(service.name, method.name), self._import("typing_extensions", "TypeVar"))
+            with self._indent():
+                wl("'{}',", _build_typevar_name(service.name, method.name))
+                wl("{}[", self._callable_type(method, is_async=False))
+                with self._indent():
+                    wl("{},", self._input_type(method))
+                    wl("{},", self._output_type(method))
+                wl("],")
+                wl("{}[", self._callable_type(method, is_async=True))
+                with self._indent():
+                    wl("{},", self._input_type(method))
+                    wl("{},", self._output_type(method))
+                wl("],")
+                wl("default={}[", self._callable_type(method, is_async=False))
+                with self._indent():
+                    wl("{},", self._input_type(method))
+                    wl("{},", self._output_type(method))
+                wl("],")
+            wl(")")
+            wl("")
+
+    def write_self_types(self, service: d.ServiceDescriptorProto, is_async: bool) -> None:
+        wl = self._write_line
+        methods = [(i, m) for i, m in enumerate(service.method) if m.name not in PYTHON_RESERVED]
+        if not methods:
+            return
+        for _, method in methods:
+            with self._indent():
+                wl("{}[", self._callable_type(method, is_async=is_async))
+                with self._indent():
+                    wl("{},", self._input_type(method))
+                    wl("{},", self._output_type(method))
+                wl("],")
+
     def write_grpc_methods(self, service: d.ServiceDescriptorProto, scl_prefix: SourceCodeLocation) -> None:
         wl = self._write_line
         methods = [(i, m) for i, m in enumerate(service.method) if m.name not in PYTHON_RESERVED]
@@ -769,11 +813,7 @@ def write_grpc_stub_methods(self, service: d.ServiceDescriptorProto, scl_prefix:
         for i, method in methods:
             scl = scl_prefix + [d.ServiceDescriptorProto.METHOD_FIELD_NUMBER, i]
 
-            wl("{}: {}[", method.name, self._callable_type(method, is_async=is_async))
-            with self._indent():
-                wl("{},", self._input_type(method))
-                wl("{},", self._output_type(method))
-            wl("]")
+            wl("{}: {}", method.name, f"{_build_typevar_name(service.name, method.name)}")
             self._write_comments(scl)
             wl("")
 
@@ -791,29 +831,48 @@ def write_grpc_services(
 
             scl = scl_prefix + [i]
 
+            # Type vars
+            self.write_grpc_type_vars(service)
+
             # The stub client
+            class_name = f"{service.name}Stub"
             wl(
-                "class {}Stub:",
-                service.name,
+                "class {}({}[{}]):",
+                class_name,
+                self._import("typing", "Generic"),
+                ", ".join(f"{_build_typevar_name(service.name, method.name)}" for method in service.method),
             )
             with self._indent():
                 if self._write_comments(scl):
                     wl("")
-                # To support casting into FooAsyncStub, allow both Channel and aio.Channel here.
-                channel = f"{self._import('typing', 'Union')}[{self._import('grpc', 'Channel')}, {self._import('grpc.aio', 'Channel')}]"
-                wl("def __init__(self, channel: {}) -> None: ...", channel)
+
+                # Write sync overload
+                wl("@{}", self._import("typing", "overload"))
+                wl("def __init__(self: {}[", class_name)
+                self.write_self_types(service, False)
+                wl(
+                    "], channel: {}) -> None: ...",
+                    self._import("grpc", "Channel"),
+                )
+                wl("")
+
+                # Write async overload
+                wl("@{}", self._import("typing", "overload"))
+                wl("def __init__(self: {}[", class_name)
+                self.write_self_types(service, True)
+                wl(
+                    "], channel: {}) -> None: ...",
+                    self._import("grpc.aio", "Channel"),
+                )
+                wl("")
+
                 self.write_grpc_stub_methods(service, scl)
 
-            # The (fake) async stub client
-            wl(
-                "class {}AsyncStub:",
-                service.name,
-            )
-            with self._indent():
-                if self._write_comments(scl):
-                    wl("")
-                # No __init__ since this isn't a real class (yet), and requires manual casting to work.
-                self.write_grpc_stub_methods(service, scl, is_async=True)
+            # Write AsyncStub alias
+            wl("{}AsyncStub: {} = {}[", service.name, self._import("typing_extensions", "TypeAlias"), class_name)
+            self.write_self_types(service, True)
+            wl("]")
+            wl("")
 
             # The service definition interface
             wl(
diff --git a/run_test.sh b/run_test.sh
index 01c49305..b0b08864 100755
--- a/run_test.sh
+++ b/run_test.sh
@@ -169,7 +169,8 @@ for PY_VER in $PY_VER_UNIT_TESTS; do
             # Write output to file. Make variant w/ omitted line numbers for easy diffing / CR
             PY_VER_MYPY_TARGET=$(echo "$1" | cut -d. -f1-2)
             export MYPYPATH=$MYPYPATH:test/generated
-            mypy --custom-typeshed-dir="$CUSTOM_TYPESHED_DIR" --python-executable="venv_$1/bin/python" --python-version="$PY_VER_MYPY_TARGET" "${@: 2}" > "$MYPY_OUTPUT/mypy_output" || true
+            # Use --no-incremental to avoid caching issues: https://github.com/python/mypy/issues/16363
+            mypy --custom-typeshed-dir="$CUSTOM_TYPESHED_DIR" --python-executable="venv_$1/bin/python" --no-incremental --python-version="$PY_VER_MYPY_TARGET" "${@: 2}" > "$MYPY_OUTPUT/mypy_output" || true
             cut -d: -f1,3- "$MYPY_OUTPUT/mypy_output" > "$MYPY_OUTPUT/mypy_output.omit_linenos"
         }
 
diff --git a/test/generated/testproto/grpc/dummy_pb2_grpc.pyi b/test/generated/testproto/grpc/dummy_pb2_grpc.pyi
index 3b8d781c..7b92d72a 100644
--- a/test/generated/testproto/grpc/dummy_pb2_grpc.pyi
+++ b/test/generated/testproto/grpc/dummy_pb2_grpc.pyi
@@ -7,9 +7,15 @@ import abc
 import collections.abc
 import grpc
 import grpc.aio
+import sys
 import testproto.grpc.dummy_pb2
 import typing
 
+if sys.version_info >= (3, 13):
+    import typing as typing_extensions
+else:
+    import typing_extensions
+
 _T = typing.TypeVar("_T")
 
 class _MaybeAsyncIterator(collections.abc.AsyncIterator[_T], collections.abc.Iterator[_T], metaclass=abc.ABCMeta): ...
@@ -19,60 +25,143 @@ class _ServicerContext(grpc.ServicerContext, grpc.aio.ServicerContext):  # type:
 
 GRPC_GENERATED_VERSION: str
 GRPC_VERSION: str
-class DummyServiceStub:
-    """DummyService"""
-
-    def __init__(self, channel: typing.Union[grpc.Channel, grpc.aio.Channel]) -> None: ...
-    UnaryUnary: grpc.UnaryUnaryMultiCallable[
+_DummyServiceUnaryUnaryType = typing_extensions.TypeVar(
+    '_DummyServiceUnaryUnaryType',
+    grpc.UnaryUnaryMultiCallable[
         testproto.grpc.dummy_pb2.DummyRequest,
         testproto.grpc.dummy_pb2.DummyReply,
-    ]
-    """UnaryUnary"""
+    ],
+    grpc.aio.UnaryUnaryMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+    default=grpc.UnaryUnaryMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+)
 
-    UnaryStream: grpc.UnaryStreamMultiCallable[
+_DummyServiceUnaryStreamType = typing_extensions.TypeVar(
+    '_DummyServiceUnaryStreamType',
+    grpc.UnaryStreamMultiCallable[
         testproto.grpc.dummy_pb2.DummyRequest,
         testproto.grpc.dummy_pb2.DummyReply,
-    ]
-    """UnaryStream"""
+    ],
+    grpc.aio.UnaryStreamMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+    default=grpc.UnaryStreamMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+)
 
-    StreamUnary: grpc.StreamUnaryMultiCallable[
+_DummyServiceStreamUnaryType = typing_extensions.TypeVar(
+    '_DummyServiceStreamUnaryType',
+    grpc.StreamUnaryMultiCallable[
         testproto.grpc.dummy_pb2.DummyRequest,
         testproto.grpc.dummy_pb2.DummyReply,
-    ]
-    """StreamUnary"""
+    ],
+    grpc.aio.StreamUnaryMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+    default=grpc.StreamUnaryMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+)
 
-    StreamStream: grpc.StreamStreamMultiCallable[
+_DummyServiceStreamStreamType = typing_extensions.TypeVar(
+    '_DummyServiceStreamStreamType',
+    grpc.StreamStreamMultiCallable[
         testproto.grpc.dummy_pb2.DummyRequest,
         testproto.grpc.dummy_pb2.DummyReply,
-    ]
-    """StreamStream"""
+    ],
+    grpc.aio.StreamStreamMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+    default=grpc.StreamStreamMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+)
 
-class DummyServiceAsyncStub:
+class DummyServiceStub(typing.Generic[_DummyServiceUnaryUnaryType, _DummyServiceUnaryStreamType, _DummyServiceStreamUnaryType, _DummyServiceStreamStreamType]):
     """DummyService"""
 
-    UnaryUnary: grpc.aio.UnaryUnaryMultiCallable[
-        testproto.grpc.dummy_pb2.DummyRequest,
-        testproto.grpc.dummy_pb2.DummyReply,
-    ]
+    @typing.overload
+    def __init__(self: DummyServiceStub[
+        grpc.UnaryUnaryMultiCallable[
+            testproto.grpc.dummy_pb2.DummyRequest,
+            testproto.grpc.dummy_pb2.DummyReply,
+        ],
+        grpc.UnaryStreamMultiCallable[
+            testproto.grpc.dummy_pb2.DummyRequest,
+            testproto.grpc.dummy_pb2.DummyReply,
+        ],
+        grpc.StreamUnaryMultiCallable[
+            testproto.grpc.dummy_pb2.DummyRequest,
+            testproto.grpc.dummy_pb2.DummyReply,
+        ],
+        grpc.StreamStreamMultiCallable[
+            testproto.grpc.dummy_pb2.DummyRequest,
+            testproto.grpc.dummy_pb2.DummyReply,
+        ],
+    ], channel: grpc.Channel) -> None: ...
+
+    @typing.overload
+    def __init__(self: DummyServiceStub[
+        grpc.aio.UnaryUnaryMultiCallable[
+            testproto.grpc.dummy_pb2.DummyRequest,
+            testproto.grpc.dummy_pb2.DummyReply,
+        ],
+        grpc.aio.UnaryStreamMultiCallable[
+            testproto.grpc.dummy_pb2.DummyRequest,
+            testproto.grpc.dummy_pb2.DummyReply,
+        ],
+        grpc.aio.StreamUnaryMultiCallable[
+            testproto.grpc.dummy_pb2.DummyRequest,
+            testproto.grpc.dummy_pb2.DummyReply,
+        ],
+        grpc.aio.StreamStreamMultiCallable[
+            testproto.grpc.dummy_pb2.DummyRequest,
+            testproto.grpc.dummy_pb2.DummyReply,
+        ],
+    ], channel: grpc.aio.Channel) -> None: ...
+
+    UnaryUnary: _DummyServiceUnaryUnaryType
     """UnaryUnary"""
 
-    UnaryStream: grpc.aio.UnaryStreamMultiCallable[
-        testproto.grpc.dummy_pb2.DummyRequest,
-        testproto.grpc.dummy_pb2.DummyReply,
-    ]
+    UnaryStream: _DummyServiceUnaryStreamType
     """UnaryStream"""
 
-    StreamUnary: grpc.aio.StreamUnaryMultiCallable[
-        testproto.grpc.dummy_pb2.DummyRequest,
-        testproto.grpc.dummy_pb2.DummyReply,
-    ]
+    StreamUnary: _DummyServiceStreamUnaryType
     """StreamUnary"""
 
-    StreamStream: grpc.aio.StreamStreamMultiCallable[
+    StreamStream: _DummyServiceStreamStreamType
+    """StreamStream"""
+
+DummyServiceAsyncStub: typing_extensions.TypeAlias = DummyServiceStub[
+    grpc.aio.UnaryUnaryMultiCallable[
         testproto.grpc.dummy_pb2.DummyRequest,
         testproto.grpc.dummy_pb2.DummyReply,
-    ]
-    """StreamStream"""
+    ],
+    grpc.aio.UnaryStreamMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+    grpc.aio.StreamUnaryMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+    grpc.aio.StreamStreamMultiCallable[
+        testproto.grpc.dummy_pb2.DummyRequest,
+        testproto.grpc.dummy_pb2.DummyReply,
+    ],
+]
 
 class DummyServiceServicer(metaclass=abc.ABCMeta):
     """DummyService"""
diff --git a/test/generated/testproto/grpc/import_pb2_grpc.pyi b/test/generated/testproto/grpc/import_pb2_grpc.pyi
index f1cdf31e..9ed17cc9 100644
--- a/test/generated/testproto/grpc/import_pb2_grpc.pyi
+++ b/test/generated/testproto/grpc/import_pb2_grpc.pyi
@@ -8,9 +8,15 @@ import collections.abc
 import google.protobuf.empty_pb2
 import grpc
 import grpc.aio
+import sys
 import testproto.test_pb2
 import typing
 
+if sys.version_info >= (3, 13):
+    import typing as typing_extensions
+else:
+    import typing_extensions
+
 _T = typing.TypeVar("_T")
 
 class _MaybeAsyncIterator(collections.abc.AsyncIterator[_T], collections.abc.Iterator[_T], metaclass=abc.ABCMeta): ...
@@ -20,46 +26,111 @@ class _ServicerContext(grpc.ServicerContext, grpc.aio.ServicerContext):  # type:
 
 GRPC_GENERATED_VERSION: str
 GRPC_VERSION: str
-class SimpleServiceStub:
-    """SimpleService"""
-
-    def __init__(self, channel: typing.Union[grpc.Channel, grpc.aio.Channel]) -> None: ...
-    UnaryUnary: grpc.UnaryUnaryMultiCallable[
+_SimpleServiceUnaryUnaryType = typing_extensions.TypeVar(
+    '_SimpleServiceUnaryUnaryType',
+    grpc.UnaryUnaryMultiCallable[
         google.protobuf.empty_pb2.Empty,
         testproto.test_pb2.Simple1,
-    ]
-    """UnaryUnary"""
+    ],
+    grpc.aio.UnaryUnaryMultiCallable[
+        google.protobuf.empty_pb2.Empty,
+        testproto.test_pb2.Simple1,
+    ],
+    default=grpc.UnaryUnaryMultiCallable[
+        google.protobuf.empty_pb2.Empty,
+        testproto.test_pb2.Simple1,
+    ],
+)
 
-    UnaryStream: grpc.UnaryUnaryMultiCallable[
+_SimpleServiceUnaryStreamType = typing_extensions.TypeVar(
+    '_SimpleServiceUnaryStreamType',
+    grpc.UnaryUnaryMultiCallable[
         testproto.test_pb2.Simple1,
         google.protobuf.empty_pb2.Empty,
-    ]
-    """UnaryStream"""
+    ],
+    grpc.aio.UnaryUnaryMultiCallable[
+        testproto.test_pb2.Simple1,
+        google.protobuf.empty_pb2.Empty,
+    ],
+    default=grpc.UnaryUnaryMultiCallable[
+        testproto.test_pb2.Simple1,
+        google.protobuf.empty_pb2.Empty,
+    ],
+)
 
-    NoComment: grpc.UnaryUnaryMultiCallable[
+_SimpleServiceNoCommentType = typing_extensions.TypeVar(
+    '_SimpleServiceNoCommentType',
+    grpc.UnaryUnaryMultiCallable[
         testproto.test_pb2.Simple1,
         google.protobuf.empty_pb2.Empty,
-    ]
+    ],
+    grpc.aio.UnaryUnaryMultiCallable[
+        testproto.test_pb2.Simple1,
+        google.protobuf.empty_pb2.Empty,
+    ],
+    default=grpc.UnaryUnaryMultiCallable[
+        testproto.test_pb2.Simple1,
+        google.protobuf.empty_pb2.Empty,
+    ],
+)
 
-class SimpleServiceAsyncStub:
+class SimpleServiceStub(typing.Generic[_SimpleServiceUnaryUnaryType, _SimpleServiceUnaryStreamType, _SimpleServiceNoCommentType]):
     """SimpleService"""
 
-    UnaryUnary: grpc.aio.UnaryUnaryMultiCallable[
-        google.protobuf.empty_pb2.Empty,
-        testproto.test_pb2.Simple1,
-    ]
+    @typing.overload
+    def __init__(self: SimpleServiceStub[
+        grpc.UnaryUnaryMultiCallable[
+            google.protobuf.empty_pb2.Empty,
+            testproto.test_pb2.Simple1,
+        ],
+        grpc.UnaryUnaryMultiCallable[
+            testproto.test_pb2.Simple1,
+            google.protobuf.empty_pb2.Empty,
+        ],
+        grpc.UnaryUnaryMultiCallable[
+            testproto.test_pb2.Simple1,
+            google.protobuf.empty_pb2.Empty,
+        ],
+    ], channel: grpc.Channel) -> None: ...
+
+    @typing.overload
+    def __init__(self: SimpleServiceStub[
+        grpc.aio.UnaryUnaryMultiCallable[
+            google.protobuf.empty_pb2.Empty,
+            testproto.test_pb2.Simple1,
+        ],
+        grpc.aio.UnaryUnaryMultiCallable[
+            testproto.test_pb2.Simple1,
+            google.protobuf.empty_pb2.Empty,
+        ],
+        grpc.aio.UnaryUnaryMultiCallable[
+            testproto.test_pb2.Simple1,
+            google.protobuf.empty_pb2.Empty,
+        ],
+    ], channel: grpc.aio.Channel) -> None: ...
+
+    UnaryUnary: _SimpleServiceUnaryUnaryType
     """UnaryUnary"""
 
-    UnaryStream: grpc.aio.UnaryUnaryMultiCallable[
-        testproto.test_pb2.Simple1,
-        google.protobuf.empty_pb2.Empty,
-    ]
+    UnaryStream: _SimpleServiceUnaryStreamType
     """UnaryStream"""
 
-    NoComment: grpc.aio.UnaryUnaryMultiCallable[
+    NoComment: _SimpleServiceNoCommentType
+
+SimpleServiceAsyncStub: typing_extensions.TypeAlias = SimpleServiceStub[
+    grpc.aio.UnaryUnaryMultiCallable[
+        google.protobuf.empty_pb2.Empty,
+        testproto.test_pb2.Simple1,
+    ],
+    grpc.aio.UnaryUnaryMultiCallable[
+        testproto.test_pb2.Simple1,
+        google.protobuf.empty_pb2.Empty,
+    ],
+    grpc.aio.UnaryUnaryMultiCallable[
         testproto.test_pb2.Simple1,
         google.protobuf.empty_pb2.Empty,
-    ]
+    ],
+]
 
 class SimpleServiceServicer(metaclass=abc.ABCMeta):
     """SimpleService"""
diff --git a/test/test_grpc_async_usage.py b/test/test_grpc_async_usage.py
index 150dceb4..17c3a96d 100644
--- a/test/test_grpc_async_usage.py
+++ b/test/test_grpc_async_usage.py
@@ -53,7 +53,7 @@ async def test_grpc() -> None:
     server = make_server()
     await server.start()
     async with grpc.aio.insecure_channel(ADDRESS) as channel:
-        client: dummy_pb2_grpc.DummyServiceAsyncStub = dummy_pb2_grpc.DummyServiceStub(channel)  # type: ignore
+        client = dummy_pb2_grpc.DummyServiceStub(channel)
         request = dummy_pb2.DummyRequest(value="cprg")
         result1 = await client.UnaryUnary(request)
         result2 = client.UnaryStream(dummy_pb2.DummyRequest(value=result1.value))
diff --git a/test_negative/output.expected.3.8 b/test_negative/output.expected.3.8
index cdf01992..b57c10c2 100644
--- a/test_negative/output.expected.3.8
+++ b/test_negative/output.expected.3.8
@@ -72,7 +72,9 @@ test_negative/negative.py:173: error: Property "a_repeated_string" defined in "S
 test_negative/negative.py:174: error: Property "rep_inner_enum" defined in "Simple1" is read-only  [misc]
 test_negative/negative.py:179: error: "_r_None" has no attribute "invalid"; maybe "valid"?  [attr-defined]
 test_negative/negative.py:183: error: Incompatible types in assignment (expression has type "ValueType", variable has type "str")  [assignment]
-test_negative/negative.py:185: error: Missing positional argument "channel" in call to "DummyServiceStub"  [call-arg]
+test_negative/negative.py:185: error: All overload variants of "DummyServiceStub" require at least one argument  [call-overload]
+test_negative/negative.py:185: note: Possible overload variants:
+test_negative/negative.py:185: note:     def [_DummyServiceUnaryUnaryType: (UnaryUnaryMultiCallable[DummyRequest, DummyReply], UnaryUnaryMultiCallable[DummyRequest, DummyReply]), _DummyServiceUnaryStreamType: (UnaryStreamMultiCallable[DummyRequest, DummyReply], UnaryStreamMultiCallable[DummyRequest, DummyReply]), _DummyServiceStreamUnaryType: (StreamUnaryMultiCallable[DummyRequest, DummyReply], StreamUnaryMultiCallable[DummyRequest, DummyReply]), _DummyServiceStreamStreamType: (StreamStreamMultiCallable[DummyRequest, DummyReply], StreamStreamMultiCallable[DummyRequest, DummyReply])] __init__(self, channel: Channel) -> DummyServiceStub[UnaryUnaryMultiCallable[DummyRequest, DummyReply], UnaryStreamMultiCallable[DummyRequest, DummyReply], StreamUnaryMultiCallable[DummyRequest, DummyReply], StreamStreamMultiCallable[DummyRequest, DummyReply]]
 test_negative/negative.py:192: error: "DummyReply" has no attribute "not_exists"  [attr-defined]
 test_negative/negative.py:193: error: "DummyReply" has no attribute "__iter__" (not iterable)  [attr-defined]
 test_negative/negative.py:198: error: "DummyReply" has no attribute "not_exists"  [attr-defined]
diff --git a/test_negative/output.expected.3.8.omit_linenos b/test_negative/output.expected.3.8.omit_linenos
index 5bc6fb58..734b8eba 100644
--- a/test_negative/output.expected.3.8.omit_linenos
+++ b/test_negative/output.expected.3.8.omit_linenos
@@ -72,7 +72,9 @@ test_negative/negative.py: error: Property "a_repeated_string" defined in "Simpl
 test_negative/negative.py: error: Property "rep_inner_enum" defined in "Simple1" is read-only  [misc]
 test_negative/negative.py: error: "_r_None" has no attribute "invalid"; maybe "valid"?  [attr-defined]
 test_negative/negative.py: error: Incompatible types in assignment (expression has type "ValueType", variable has type "str")  [assignment]
-test_negative/negative.py: error: Missing positional argument "channel" in call to "DummyServiceStub"  [call-arg]
+test_negative/negative.py: error: All overload variants of "DummyServiceStub" require at least one argument  [call-overload]
+test_negative/negative.py: note: Possible overload variants:
+test_negative/negative.py: note:     def [_DummyServiceUnaryUnaryType: (UnaryUnaryMultiCallable[DummyRequest, DummyReply], UnaryUnaryMultiCallable[DummyRequest, DummyReply]), _DummyServiceUnaryStreamType: (UnaryStreamMultiCallable[DummyRequest, DummyReply], UnaryStreamMultiCallable[DummyRequest, DummyReply]), _DummyServiceStreamUnaryType: (StreamUnaryMultiCallable[DummyRequest, DummyReply], StreamUnaryMultiCallable[DummyRequest, DummyReply]), _DummyServiceStreamStreamType: (StreamStreamMultiCallable[DummyRequest, DummyReply], StreamStreamMultiCallable[DummyRequest, DummyReply])] __init__(self, channel: Channel) -> DummyServiceStub[UnaryUnaryMultiCallable[DummyRequest, DummyReply], UnaryStreamMultiCallable[DummyRequest, DummyReply], StreamUnaryMultiCallable[DummyRequest, DummyReply], StreamStreamMultiCallable[DummyRequest, DummyReply]]
 test_negative/negative.py: error: "DummyReply" has no attribute "not_exists"  [attr-defined]
 test_negative/negative.py: error: "DummyReply" has no attribute "__iter__" (not iterable)  [attr-defined]
 test_negative/negative.py: error: "DummyReply" has no attribute "not_exists"  [attr-defined]