diff --git a/src/Storages/System/CMakeLists.txt b/src/Storages/System/CMakeLists.txt
index f6d443b9aa3..a1eb525dceb 100644
--- a/src/Storages/System/CMakeLists.txt
+++ b/src/Storages/System/CMakeLists.txt
@@ -15,8 +15,6 @@ include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
 add_headers_and_sources(storages_system .)
 list (APPEND storages_system_sources ${CONFIG_BUILD})
 
-set_source_files_properties(StorageSystemStackTrace.cpp PROPERTIES COMPILE_FLAGS -fno-sanitize=thread)
-
 add_custom_target(generate-contributors
     ./StorageSystemContributors.sh
     SOURCES StorageSystemContributors.sh
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index 5cfad1f5bdc..92d12c19986 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -47,7 +47,7 @@ namespace
 
     LazyPipeFDs notification_pipe;
 
-    void signalHandler(int, siginfo_t * info, void * context)
+    void NO_SANITIZE_THREAD signalHandler(int, siginfo_t * info, void * context)
     {
         auto saved_errno = errno;   /// We must restore previous value of errno in signal handler.
 
@@ -79,7 +79,7 @@ namespace
     }
 
     /// Wait for data in pipe and read it.
-    bool wait(int timeout_ms)
+    bool NO_SANITIZE_THREAD wait(int timeout_ms)
     {
         while (true)
         {
@@ -127,7 +127,7 @@ namespace
 }
 
 
-StorageSystemStackTrace::StorageSystemStackTrace(const StorageID & table_id_)
+NO_SANITIZE_THREAD StorageSystemStackTrace::StorageSystemStackTrace(const StorageID & table_id_)
     : IStorageSystemOneBlock<StorageSystemStackTrace>(table_id_)
 {
     notification_pipe.open();
@@ -160,7 +160,7 @@ NamesAndTypesList StorageSystemStackTrace::getNamesAndTypes()
 }
 
 
-void StorageSystemStackTrace::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void NO_SANITIZE_THREAD StorageSystemStackTrace::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
 {
     /// It shouldn't be possible to do concurrent reads from this table.
     std::lock_guard lock(mutex);