diff --git a/core/trino-main/src/main/java/io/trino/server/ui/TrimmedBasicQueryInfo.java b/core/trino-main/src/main/java/io/trino/server/ui/TrimmedBasicQueryInfo.java
index ab2cff5e9300..ad616d45842a 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/TrimmedBasicQueryInfo.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/TrimmedBasicQueryInfo.java
@@ -27,6 +27,7 @@
 
 import java.net.URI;
 import java.util.Optional;
+import java.util.Set;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
@@ -53,6 +54,7 @@ public class TrimmedBasicQueryInfo
     private final Optional<ErrorCode> errorCode;
     private final Optional<QueryType> queryType;
     private final RetryPolicy retryPolicy;
+    private final Optional<Set<String>> clientTags;
 
     public TrimmedBasicQueryInfo(BasicQueryInfo queryInfo)
     {
@@ -79,6 +81,7 @@ public TrimmedBasicQueryInfo(BasicQueryInfo queryInfo)
         this.queryStats = requireNonNull(queryInfo.getQueryStats(), "queryStats is null");
         this.queryType = requireNonNull(queryInfo.getQueryType(), "queryType is null");
         this.retryPolicy = requireNonNull(queryInfo.getRetryPolicy(), "retryPolicy is null");
+        this.clientTags = Optional.ofNullable(queryInfo.getSession().getClientTags());
     }
 
     @JsonProperty
@@ -183,6 +186,12 @@ public RetryPolicy getRetryPolicy()
         return retryPolicy;
     }
 
+    @JsonProperty
+    public Optional<Set<String>> getClientTags()
+    {
+        return clientTags;
+    }
+
     @Override
     public String toString()
     {
diff --git a/core/trino-web-ui/src/main/resources/webapp/src/components/QueryList.jsx b/core/trino-web-ui/src/main/resources/webapp/src/components/QueryList.jsx
index 415490512d99..816fd34b1b8d 100644
--- a/core/trino-web-ui/src/main/resources/webapp/src/components/QueryList.jsx
+++ b/core/trino-web-ui/src/main/resources/webapp/src/components/QueryList.jsx
@@ -470,6 +470,13 @@ export class QueryList extends React.Component {
                 ) {
                     return true
                 }
+
+                if (
+                    query.clientTags &&
+                    query.clientTags.some((clientTag) => clientTag.toLowerCase().indexOf(term) !== -1)
+                ) {
+                    return true
+                }
             }, this)
         }
     }
@@ -810,7 +817,7 @@ export class QueryList extends React.Component {
                             <input
                                 type="text"
                                 className="form-control form-control-small search-bar"
-                                placeholder="User, source, query ID, query state, resource group, error name, or query text"
+                                placeholder="User, source, query ID, query state, resource group, error name, query text or client tags"
                                 onChange={this.handleSearchStringChange}
                                 value={this.state.searchString}
                             />