diff --git a/tools/code_execution_tool.py b/tools/code_execution_tool.py
index a9e9d8081..13b2a7b27 100644
--- a/tools/code_execution_tool.py
+++ b/tools/code_execution_tool.py
@@ -502,7 +502,6 @@ def execute_code(
         duration = round(time.monotonic() - exec_start, 2)
 
         # Wait for RPC thread to finish
-        server_sock.close()
         rpc_thread.join(timeout=3)
 
         # Build response
@@ -538,6 +537,10 @@ def execute_code(
 
     finally:
         # Cleanup temp dir and socket
+        try:
+            server_sock.close()
+        except Exception:
+            pass
         try:
             import shutil
             shutil.rmtree(tmpdir, ignore_errors=True)