diff --git a/src/bentoml/_internal/client/__init__.py b/src/bentoml/_internal/client/__init__.py
index 4786dfb792f..9d014ef3a84 100644
--- a/src/bentoml/_internal/client/__init__.py
+++ b/src/bentoml/_internal/client/__init__.py
@@ -84,7 +84,7 @@ def wait_until_server_ready(
     @staticmethod
     def from_url(
         server_url: str, *, kind: None | t.Literal["auto"] = ...
-    ) -> GrpcClient | HTTPClient:
+    ) -> Client:
         ...
 
     @t.overload
diff --git a/src/bentoml/server.py b/src/bentoml/server.py
index b2ecf302346..48dd3101401 100644
--- a/src/bentoml/server.py
+++ b/src/bentoml/server.py
@@ -17,8 +17,8 @@
 
 from ._internal.bento import Bento
 from ._internal.client import Client
-from ._internal.client import GrpcClient
-from ._internal.client import HTTPClient
+from ._internal.client.grpc import GrpcClient
+from ._internal.client.http import HTTPClient
 from ._internal.configuration.containers import BentoMLContainer
 from ._internal.service import Service
 from ._internal.tag import Tag