diff --git a/iotdb-core/ainode/iotdb/ainode/core/ai_node.py b/iotdb-core/ainode/iotdb/ainode/core/ai_node.py
index d8f619e1b8d3..7ad0dce842f0 100644
--- a/iotdb-core/ainode/iotdb/ainode/core/ai_node.py
+++ b/iotdb-core/ainode/iotdb/ainode/core/ai_node.py
@@ -161,13 +161,4 @@ def stop(self):
         if not self._stop_event.is_set():
             self._stop_event.set()
             self._rpc_handler.stop()
-            if self._rpc_service:
-                self._rpc_service.stop()
-                for retry in range(30):
-                    self._rpc_service.join(2)
-                    if not self._rpc_service.is_alive():
-                        logger.warning(
-                            "RPC service thread failed to stop in time, retrying..."
-                        )
-                        break
-            logger.info("IoTDB-AINode has successfully stopped.")
+            self._rpc_service.stop()
diff --git a/iotdb-core/ainode/iotdb/ainode/core/rpc/service.py b/iotdb-core/ainode/iotdb/ainode/core/rpc/service.py
index fc93a0cce7d5..472b91c204a7 100644
--- a/iotdb-core/ainode/iotdb/ainode/core/rpc/service.py
+++ b/iotdb-core/ainode/iotdb/ainode/core/rpc/service.py
@@ -49,7 +49,7 @@ def serve(self) -> None:
         self.serverTransport.listen()
         while not self._stop_event.is_set():
             try:
-                client = self.serverTransport.accept()  # TODO: Fix the block problem
+                client = self.serverTransport.accept()
                 if not client:
                     continue
                 self.clients.put(client)