diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake
index 22cc503cac7a9c04719cc348f507563c3a09871a..f03f402f626615368968d799b4c030fb50b8dc3b 100644
--- a/core/cmake/ThirdPartyPackages.cmake
+++ b/core/cmake/ThirdPartyPackages.cmake
@@ -240,8 +240,8 @@ endif ()
 if (DEFINED ENV{MILVUS_OATPP_URL})
     set(OATPP_SOURCE_URL "$ENV{MILVUS_OATPP_URL}")
 else ()
-     set(OATPP_SOURCE_URL "https://github.com/oatpp/oatpp/archive/${OATPP_VERSION}.tar.gz")
-#    set(OATPP_SOURCE_URL "https://github.com/BossZou/oatpp/archive/${OATPP_VERSION}.zip")
+    set(OATPP_SOURCE_URL "https://github.com/oatpp/oatpp/archive/${OATPP_VERSION}.tar.gz")
+#   set(OATPP_SOURCE_URL "https://github.com/BossZou/oatpp/archive/${OATPP_VERSION}.zip")
 endif ()
 
 if (DEFINED ENV{MILVUS_AWS_URL})
diff --git a/core/src/scheduler/SchedInst.cpp b/core/src/scheduler/SchedInst.cpp
index 28157667721e15563ee9eda09c273946227c82af..2ec6e241e865bb1b756460e3f60bebebaf15c810 100644
--- a/core/src/scheduler/SchedInst.cpp
+++ b/core/src/scheduler/SchedInst.cpp
@@ -102,6 +102,7 @@ StopSchedulerService() {
     JobMgrInst::GetInstance()->Stop();
     SchedInst::GetInstance()->Stop();
     ResMgrInst::GetInstance()->Stop();
+    OptimizerInst::GetInstance()->Stop();
 }
 
 }  // namespace scheduler
diff --git a/core/src/scheduler/selector/Optimizer.cpp b/core/src/scheduler/selector/Optimizer.cpp
index 497287fa05913f23e21e1c7b731b29ecdf0448fe..0b1cf9492800c64506488d952b1598b340f18dbd 100644
--- a/core/src/scheduler/selector/Optimizer.cpp
+++ b/core/src/scheduler/selector/Optimizer.cpp
@@ -32,5 +32,10 @@ Optimizer::Run(const TaskPtr& task) {
     return false;
 }
 
+void
+Optimizer::Stop() {
+    pass_list_ = std::vector<PassPtr>();
+}
+
 }  // namespace scheduler
 }  // namespace milvus
diff --git a/core/src/scheduler/selector/Optimizer.h b/core/src/scheduler/selector/Optimizer.h
index 5bf6ddf07fbb1c031445b6b02fb22547cc3f35b7..d2688f2df068fae71d824776c6bf8be214f84971 100644
--- a/core/src/scheduler/selector/Optimizer.h
+++ b/core/src/scheduler/selector/Optimizer.h
@@ -38,6 +38,9 @@ class Optimizer {
     bool
     Run(const TaskPtr& task);
 
+    void
+    Stop();
+
  private:
     std::vector<PassPtr> pass_list_;
 };
diff --git a/core/src/server/web_impl/WebServer.cpp b/core/src/server/web_impl/WebServer.cpp
index 14364c871772efcf076426550b76725275bc6549..21055e123cead6821a94a03aea8d5f42208793c2 100644
--- a/core/src/server/web_impl/WebServer.cpp
+++ b/core/src/server/web_impl/WebServer.cpp
@@ -65,13 +65,10 @@ WebServer::StartService() {
             }
 
             server.stop();
-            OATPP_COMPONENT(std::shared_ptr<oatpp::network::ClientConnectionProvider>, client_provider);
-            client_provider->getConnection();
         });
 
         // start synchronously
         server.run();
-        connection_handler->stop();
         stop_thread.join();
     }
     oatpp::base::Environment::destroy();