diff --git a/serving/core/server.cc b/serving/core/server.cc
index 7b7c2290fa..634881ddeb 100644
--- a/serving/core/server.cc
+++ b/serving/core/server.cc
@@ -262,9 +262,9 @@ Status Server::BuildAndStart() {
   ClearEnv();
   server->Shutdown();
   event_base_loopexit(eb, nullptr);
-  exit_http();
   grpc_thread.join();
   restful_thread.join();
+  exit_http();
   return SUCCESS;
 }
 }  // namespace serving