diff --git a/src/bentoml/_internal/marshal/dispatcher.py b/src/bentoml/_internal/marshal/dispatcher.py
index 55ad9d5ee07..e806a523e86 100644
--- a/src/bentoml/_internal/marshal/dispatcher.py
+++ b/src/bentoml/_internal/marshal/dispatcher.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-import time
-import typing as t
 import asyncio
-import logging
+import collections
 import functools
+import logging
+import time
 import traceback
-import collections
+import typing as t
 
 import attr
 import numpy as np
@@ -14,12 +14,13 @@
 from ..utils import cached_property
 from ..utils.alg import TokenBucket
 
+
 logger = logging.getLogger(__name__)
 
 
 if t.TYPE_CHECKING:
-    from ..runner.utils import Params
     from ..runner.container import Payload
+    from ..runner.utils import Params
 
 
 class NonBlockSema:
@@ -235,7 +236,7 @@ async def train_optimizer(
                     info.enqueue_time = now
                 self._loop.create_task(self.outbound_call(inputs_info))
         except asyncio.CancelledError:
-            return
+            raise
         except Exception as e:  # pylint: disable=broad-except
             logger.error(traceback.format_exc(), exc_info=e)
 
diff --git a/tests/e2e/bento_server_http/tests/test_serve.py b/tests/e2e/bento_server_http/tests/test_serve.py
index 5888ed4ca9b..85a8f54e3e6 100644
--- a/tests/e2e/bento_server_http/tests/test_serve.py
+++ b/tests/e2e/bento_server_http/tests/test_serve.py
@@ -20,7 +20,7 @@ def test_http_server(bentoml_home: str):
 
     server.stop()
 
-    timeout = 60
+    timeout = 10
     start_time = time.time()
     while time.time() - start_time < timeout:
         retcode = server.process.poll()
@@ -48,7 +48,7 @@ def test_http_server_ctx(bentoml_home: str):
 
         assert res == {"more_test": "and more json"}
 
-    timeout = 60
+    timeout = 10
     start_time = time.time()
     while time.time() - start_time < timeout:
         retcode = server.process.poll()