diff --git a/src/.clang-tidy b/src/.clang-tidy
index 3569dd04b1f..1cf270833a2 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -14,6 +14,7 @@ modernize-use-emplace,
 modernize-use-equals-default,
 modernize-use-noexcept,
 modernize-use-nullptr,
+modernize-use-starts-ends-with,
 performance-*,
 -performance-avoid-endl,
 -performance-enum-size,
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 0e5503a17fd..ebdab1043e8 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -315,7 +315,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
         if (i->exactMatch)
             match = (strURI == i->prefix);
         else
-            match = (strURI.substr(0, i->prefix.size()) == i->prefix);
+            match = strURI.starts_with(i->prefix);
         if (match) {
             path = strURI.substr(i->prefix.size());
             break;
diff --git a/src/init.cpp b/src/init.cpp
index da3d99b6bf2..bda46a26e7d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1356,7 +1356,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
             if (!SplitHostPort(socket_addr, port_out, host_out)) {
 #ifdef HAVE_SOCKADDR_UN
                 // Allow unix domain sockets for some options e.g. unix:/some/file/path
-                if (!unix || socket_addr.find(ADDR_PREFIX_UNIX) != 0) {
+                if (!unix || !socket_addr.starts_with(ADDR_PREFIX_UNIX)) {
                     return InitError(InvalidPortErrMsg(arg, socket_addr));
                 }
 #else
diff --git a/src/netbase.cpp b/src/netbase.cpp
index a6de72090e6..76a5f9834e5 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -230,7 +230,7 @@ CService LookupNumeric(const std::string& name, uint16_t portDefault, DNSLookupF
 bool IsUnixSocketPath(const std::string& name)
 {
 #ifdef HAVE_SOCKADDR_UN
-    if (name.find(ADDR_PREFIX_UNIX) != 0) return false;
+    if (!name.starts_with(ADDR_PREFIX_UNIX)) return false;
 
     // Split off "unix:" prefix
     std::string str{name.substr(ADDR_PREFIX_UNIX.length())};