diff --git a/base/base/ReplxxLineReader.cpp b/base/base/ReplxxLineReader.cpp
index 9ea53bb132b..0569567d4f8 100644
--- a/base/base/ReplxxLineReader.cpp
+++ b/base/base/ReplxxLineReader.cpp
@@ -378,4 +378,4 @@ void ReplxxLineReader::enableBracketedPaste()
 {
     bracketed_paste_enabled = true;
     rx.enable_bracketed_paste();
-};
+}
diff --git a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
index 20307c0ccd3..a10c25c3342 100644
--- a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
+++ b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
@@ -71,7 +71,7 @@ void processFile(const fs::path & file_path, const fs::path & dst_path, bool tes
         dst_buf->next();
         dst_buf->finalize();
     }
-};
+}
 
 
 void processTableFiles(const fs::path & data_path, fs::path dst_path, bool test_mode, bool link)
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.h b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
index 887769dfbf5..089f70cd26b 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.h
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
@@ -245,4 +245,4 @@ public:
 
 };
 
-};
+}
diff --git a/src/AggregateFunctions/AggregateFunctionMeanZTest.h b/src/AggregateFunctions/AggregateFunctionMeanZTest.h
index e4be2503d87..7fecff591e6 100644
--- a/src/AggregateFunctions/AggregateFunctionMeanZTest.h
+++ b/src/AggregateFunctions/AggregateFunctionMeanZTest.h
@@ -136,4 +136,4 @@ public:
     }
 };
 
-};
+}
diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
index 733416d4721..a9bf8254f35 100644
--- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
+++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
@@ -102,4 +102,4 @@ public:
 
 };
 
-};
+}
diff --git a/src/AggregateFunctions/AggregateFunctionTTest.h b/src/AggregateFunctions/AggregateFunctionTTest.h
index 4c939121a72..7ef5cfce9c9 100644
--- a/src/AggregateFunctions/AggregateFunctionTTest.h
+++ b/src/AggregateFunctions/AggregateFunctionTTest.h
@@ -234,4 +234,4 @@ public:
     }
 };
 
-};
+}
diff --git a/src/Common/Config/AbstractConfigurationComparison.cpp b/src/Common/Config/AbstractConfigurationComparison.cpp
index ea0b3be4b98..711c754743d 100644
--- a/src/Common/Config/AbstractConfigurationComparison.cpp
+++ b/src/Common/Config/AbstractConfigurationComparison.cpp
@@ -18,7 +18,7 @@ namespace
             result += '.';
         result += subkey;
         return result;
-    };
+    }
 }
 
 
diff --git a/src/Common/Config/configReadClient.cpp b/src/Common/Config/configReadClient.cpp
index e7bc0b72814..e5308bc3bc7 100644
--- a/src/Common/Config/configReadClient.cpp
+++ b/src/Common/Config/configReadClient.cpp
@@ -14,7 +14,7 @@ bool safeFsExists(const String & path)
 {
     std::error_code ec;
     return fs::exists(path, ec);
-};
+}
 
 bool configReadClient(Poco::Util::LayeredConfiguration & config, const std::string & home_path)
 {
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index b2fc369237e..086b64bf5f9 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -48,8 +48,8 @@ public:
 
     Exception * clone() const override { return new Exception(*this); }
     void rethrow() const override { throw *this; }
-    const char * name() const throw() override { return "DB::Exception"; }
-    const char * what() const throw() override { return message().data(); }
+    const char * name() const noexcept override { return "DB::Exception"; }
+    const char * what() const noexcept override { return message().data(); }
 
     /// Add something to the existing message.
     template <typename... Args>
@@ -77,7 +77,7 @@ private:
 #endif
     bool remote = false;
 
-    const char * className() const throw() override { return "DB::Exception"; }
+    const char * className() const noexcept override { return "DB::Exception"; }
 };
 
 
@@ -102,8 +102,8 @@ private:
     int saved_errno;
     std::optional<std::string> path;
 
-    const char * name() const throw() override { return "DB::ErrnoException"; }
-    const char * className() const throw() override { return "DB::ErrnoException"; }
+    const char * name() const noexcept override { return "DB::ErrnoException"; }
+    const char * className() const noexcept override { return "DB::ErrnoException"; }
 };
 
 
@@ -143,8 +143,8 @@ private:
     String file_name;
     mutable std::string formatted_message;
 
-    const char * name() const throw() override { return "DB::ParsingException"; }
-    const char * className() const throw() override { return "DB::ParsingException"; }
+    const char * name() const noexcept override { return "DB::ParsingException"; }
+    const char * className() const noexcept override { return "DB::ParsingException"; }
 };
 
 
diff --git a/src/Common/NetException.h b/src/Common/NetException.h
index 019a12f23b9..712893ed83b 100644
--- a/src/Common/NetException.h
+++ b/src/Common/NetException.h
@@ -22,8 +22,8 @@ public:
     void rethrow() const override { throw *this; }
 
 private:
-    const char * name() const throw() override { return "DB::NetException"; }
-    const char * className() const throw() override { return "DB::NetException"; }
+    const char * name() const noexcept override { return "DB::NetException"; }
+    const char * className() const noexcept override { return "DB::NetException"; }
 };
 
 }
diff --git a/src/Common/SensitiveDataMasker.h b/src/Common/SensitiveDataMasker.h
index edd9f10ca91..adb6f5d51e1 100644
--- a/src/Common/SensitiveDataMasker.h
+++ b/src/Common/SensitiveDataMasker.h
@@ -69,4 +69,4 @@ public:
     size_t rulesCount() const;
 };
 
-};
+}
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index 74b45d411b0..1e79468b7e3 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -401,8 +401,8 @@ public:
     Exception(const Error code_, const std::string & path); /// NOLINT
     Exception(const Exception & exc);
 
-    const char * name() const throw() override { return "Coordination::Exception"; }
-    const char * className() const throw() override { return "Coordination::Exception"; }
+    const char * name() const noexcept override { return "Coordination::Exception"; }
+    const char * className() const noexcept override { return "Coordination::Exception"; }
     Exception * clone() const override { return new Exception(*this); }
 
     const Error code;
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index a21c96abfdb..33f5095d385 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -35,7 +35,7 @@ static ReturnType onError(const std::string & message [[maybe_unused]], int code
         throw Exception(message, code);
     else
         return false;
-};
+}
 
 
 template <typename ReturnType>
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index a89e45dde59..6364b0a8f48 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -451,7 +451,7 @@ static std::string createDirectory(const std::string & file)
         return "";
     fs::create_directories(path);
     return path;
-};
+}
 
 
 static bool tryCreateDirectories(Poco::Logger * logger, const std::string & path)
@@ -794,7 +794,7 @@ static void addSignalHandler(const std::vector<int> & signals, signal_function h
 
     if (out_handled_signals)
         std::copy(signals.begin(), signals.end(), std::back_inserter(*out_handled_signals));
-};
+}
 
 
 static void blockSignals(const std::vector<int> & signals)
@@ -816,7 +816,7 @@ static void blockSignals(const std::vector<int> & signals)
 
     if (pthread_sigmask(SIG_BLOCK, &sig_set, nullptr))
         throw Poco::Exception("Cannot block signal.");
-};
+}
 
 
 void BaseDaemon::initializeTerminationAndSignalProcessing()
diff --git a/src/Daemon/SentryWriter.h b/src/Daemon/SentryWriter.h
index 0888b2fe9a3..32aeff2787a 100644
--- a/src/Daemon/SentryWriter.h
+++ b/src/Daemon/SentryWriter.h
@@ -24,4 +24,4 @@ namespace SentryWriter
         int sig,
         const std::string & error_message,
         const StackTrace & stack_trace);
-};
+}
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 9014b09b072..50cfba01894 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -89,7 +89,7 @@ constexpr void callOnDictionaryAttributeType(AttributeUnderlyingType type, F &&
         if (type == other)
             func(DictionaryAttributeType<other>{});
     });
-};
+}
 
 struct DictionarySpecialAttribute final
 {
diff --git a/src/Functions/addSubSeconds.cpp b/src/Functions/addSubSeconds.cpp
index f58f8b20b99..cb5ffce61e3 100644
--- a/src/Functions/addSubSeconds.cpp
+++ b/src/Functions/addSubSeconds.cpp
@@ -9,19 +9,19 @@ using FunctionAddNanoseconds = FunctionDateOrDateTimeAddInterval<AddNanosecondsI
 void registerFunctionAddNanoseconds(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionAddNanoseconds>();
-};
+}
 
 using FunctionAddMicroseconds = FunctionDateOrDateTimeAddInterval<AddMicrosecondsImpl>;
 void registerFunctionAddMicroseconds(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionAddMicroseconds>();
-};
+}
 
 using FunctionAddMilliseconds = FunctionDateOrDateTimeAddInterval<AddMillisecondsImpl>;
 void registerFunctionAddMilliseconds(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionAddMilliseconds>();
-};
+}
 
 }
 
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 34f396b978c..4f951d69349 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -1378,7 +1378,7 @@ void Context::killCurrentQuery()
     {
         process_list_elem->cancelQuery(true);
     }
-};
+}
 
 String Context::getDefaultFormat() const
 {
diff --git a/src/Interpreters/FilesystemCacheLog.cpp b/src/Interpreters/FilesystemCacheLog.cpp
index 609305321b1..f03472c45e0 100644
--- a/src/Interpreters/FilesystemCacheLog.cpp
+++ b/src/Interpreters/FilesystemCacheLog.cpp
@@ -75,4 +75,4 @@ void FilesystemCacheLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(read_buffer_id);
 }
 
-};
+}
diff --git a/src/Interpreters/FilesystemCacheLog.h b/src/Interpreters/FilesystemCacheLog.h
index 77bae7d788a..a3624867aec 100644
--- a/src/Interpreters/FilesystemCacheLog.h
+++ b/src/Interpreters/FilesystemCacheLog.h
@@ -58,4 +58,4 @@ class FilesystemCacheLog : public SystemLog<FilesystemCacheLogElement>
     using SystemLog<FilesystemCacheLogElement>::SystemLog;
 };
 
-};
+}
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 138d10efb35..ec260ce717e 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -1176,7 +1176,7 @@ void addFoundRowAll(
             ++current_offset;
         }
     }
-};
+}
 
 template <bool add_missing, bool need_offset>
 void addNotFoundRow(AddedColumns & added [[maybe_unused]], IColumn::Offset & current_offset [[maybe_unused]])
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 9db61bcfc9d..f7bd9000278 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -203,7 +203,7 @@ static bool isTrivialSelect(const ASTPtr & select)
     }
     /// This query is ASTSelectWithUnionQuery subquery
     return false;
-};
+}
 
 Chain InterpreterInsertQuery::buildChain(
     const StoragePtr & table,
diff --git a/src/Interpreters/UserDefinedExecutableFunction.cpp b/src/Interpreters/UserDefinedExecutableFunction.cpp
index e5a852b0e75..477a1b10f3c 100644
--- a/src/Interpreters/UserDefinedExecutableFunction.cpp
+++ b/src/Interpreters/UserDefinedExecutableFunction.cpp
@@ -21,4 +21,4 @@ UserDefinedExecutableFunction::UserDefinedExecutableFunction(
 {
 }
 
-};
+}
diff --git a/src/Interpreters/ZooKeeperLog.cpp b/src/Interpreters/ZooKeeperLog.cpp
index 2828c3e2fa8..6394b1d5429 100644
--- a/src/Interpreters/ZooKeeperLog.cpp
+++ b/src/Interpreters/ZooKeeperLog.cpp
@@ -209,4 +209,4 @@ void ZooKeeperLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(children_array);
 }
 
-};
+}
diff --git a/src/Loggers/Loggers.cpp b/src/Loggers/Loggers.cpp
index 512e44f79c7..70205998bb5 100644
--- a/src/Loggers/Loggers.cpp
+++ b/src/Loggers/Loggers.cpp
@@ -32,7 +32,7 @@ static std::string createDirectory(const std::string & file)
         return "";
     fs::create_directories(path);
     return path;
-};
+}
 
 #ifdef WITH_TEXT_LOG
 void Loggers::setTextLog(std::shared_ptr<DB::TextLog> log, int max_priority)
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index 16d11fb7e33..b257a1db090 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -196,7 +196,7 @@ MergeTreeIndexConditionPtr MergeTreeIndexMinMax::createIndexCondition(
     const SelectQueryInfo & query, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionMinMax>(index, query, context);
-};
+}
 
 bool MergeTreeIndexMinMax::mayBenefitFromIndexForIn(const ASTPtr & node) const
 {
diff --git a/src/Storages/MergeTree/RPNBuilder.h b/src/Storages/MergeTree/RPNBuilder.h
index 183808c9290..27b616dc301 100644
--- a/src/Storages/MergeTree/RPNBuilder.h
+++ b/src/Storages/MergeTree/RPNBuilder.h
@@ -120,4 +120,4 @@ private:
 };
 
 
-};
+}
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index 4a4317c9aab..9638e5186f9 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -234,5 +234,5 @@ void registerStorageExecutable(StorageFactory & factory)
     }, storage_features);
 }
 
-};
+}