diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt
index e02d4ec7701..cb37948aa38 100644
--- a/contrib/boost-cmake/CMakeLists.txt
+++ b/contrib/boost-cmake/CMakeLists.txt
@@ -257,7 +257,6 @@ if (NOT EXTERNAL_BOOST_FOUND)
     set (SRCS_THREAD
         "${LIBRARY_DIR}/libs/thread/src/future.cpp"
         "${LIBRARY_DIR}/libs/thread/src/tss_null.cpp"
-        "${LIBRARY_DIR}/libs/thread/src/pthread/once_atomic.cpp"
         "${LIBRARY_DIR}/libs/thread/src/pthread/once.cpp"
         "${LIBRARY_DIR}/libs/thread/src/pthread/thread.cpp"
     )
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index 7fdcf5e8ccf..9ab5cb374df 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -166,7 +166,8 @@ bool PipelineExecutor::prepareProcessor(UInt64 pid, Queue & queue, Queue & async
                     graph->nodes[edge->to]->processor->onUpdatePorts();
             }
         }
-        else
+
+        if (!updated_processors.empty())
         {
             pid = updated_processors.top();
             updated_processors.pop();