diff --git a/docs/release-notes/release-notes-0.20.1.md b/docs/release-notes/release-notes-0.20.1.md
index 4c08c84c859..879ac9ec8d0 100644
--- a/docs/release-notes/release-notes-0.20.1.md
+++ b/docs/release-notes/release-notes-0.20.1.md
@@ -111,6 +111,10 @@
   safe single-writer behavior until the wallet subsystem is fully 
   concurrent-safe.
 
+* [Modified the query for `IsPublicV1Node`](https://github.com/lightningnetwork/lnd/pull/10356)
+  to use `UNION ALL` instead of `OR` conditions in the `WHERE` clause, improving
+  performance when checking for public nodes especially in large graphs when using `SQL` backends.
+
 ## Deprecations
 
 # Technical and Architectural Updates
@@ -126,5 +130,6 @@
 
 # Contributors (Alphabetical Order)
 
+* Abdulkbk
 * bitromortac
 * Ziggie
diff --git a/graph/db/graph_test.go b/graph/db/graph_test.go
index 41954bc2d83..b5e7a99eb7a 100644
--- a/graph/db/graph_test.go
+++ b/graph/db/graph_test.go
@@ -1650,6 +1650,8 @@ func TestGraphCacheTraversal(t *testing.T) {
 	require.Equal(t, numChannels*2*(numNodes-1), numNodeChans)
 }
 
+// fillTestGraph fills the graph with a given number of nodes and create a given
+// number of channels between each node.
 func fillTestGraph(t testing.TB, graph *ChannelGraph, numNodes,
 	numChannels int) (map[uint64]struct{}, []*models.Node) {
 
@@ -4052,6 +4054,28 @@ func TestNodeIsPublic(t *testing.T) {
 	)
 }
 
+// BenchmarkIsPublicNode measures the performance of IsPublicNode when checking
+// a large number of nodes.
+func BenchmarkIsPublicNode(b *testing.B) {
+	graph := MakeTestGraph(b)
+
+	// Create a graph with a reasonable number of nodes and channels.
+	numNodes := 100
+	numChans := 4
+	_, nodes := fillTestGraph(b, graph, numNodes, numChans)
+
+	// Use deterministic random number generator for reproducible results.
+	rng := prand.New(prand.NewSource(42))
+
+	for b.Loop() {
+		// Query random nodes to avoid query caching and better
+		// represent real-world query patterns.
+		nodePub := nodes[rng.Intn(len(nodes))].PubKeyBytes
+		_, err := graph.IsPublicNode(nodePub)
+		require.NoError(b, err)
+	}
+}
+
 // TestDisabledChannelIDs ensures that the disabled channels within the
 // disabledEdgePolicyBucket are managed properly and the list returned from
 // DisabledChannelIDs is correct.
diff --git a/sqldb/sqlc/graph.sql.go b/sqldb/sqlc/graph.sql.go
index 8ed9333d72a..0ce7780d575 100644
--- a/sqldb/sqlc/graph.sql.go
+++ b/sqldb/sqlc/graph.sql.go
@@ -2653,7 +2653,7 @@ const isPublicV1Node = `-- name: IsPublicV1Node :one
 SELECT EXISTS (
     SELECT 1
     FROM graph_channels c
-    JOIN graph_nodes n ON n.id = c.node_id_1 OR n.id = c.node_id_2
+    JOIN graph_nodes n ON n.id = c.node_id_1
     -- NOTE: we hard-code the version here since the clauses
     -- here that determine if a node is public is specific
     -- to the V1 gossip protocol. In V1, a node is public
@@ -2665,6 +2665,13 @@ SELECT EXISTS (
     WHERE c.version = 1
       AND c.bitcoin_1_signature IS NOT NULL
       AND n.pub_key = $1
+    UNION ALL
+    SELECT 1
+    FROM graph_channels c
+    JOIN graph_nodes n ON n.id = c.node_id_2
+    WHERE c.version = 1
+      AND c.bitcoin_1_signature IS NOT NULL
+      AND n.pub_key = $1
 )
 `
 
diff --git a/sqldb/sqlc/queries/graph.sql b/sqldb/sqlc/queries/graph.sql
index b9bee182232..a8ff040d9b8 100644
--- a/sqldb/sqlc/queries/graph.sql
+++ b/sqldb/sqlc/queries/graph.sql
@@ -77,7 +77,7 @@ LIMIT $3;
 SELECT EXISTS (
     SELECT 1
     FROM graph_channels c
-    JOIN graph_nodes n ON n.id = c.node_id_1 OR n.id = c.node_id_2
+    JOIN graph_nodes n ON n.id = c.node_id_1
     -- NOTE: we hard-code the version here since the clauses
     -- here that determine if a node is public is specific
     -- to the V1 gossip protocol. In V1, a node is public
@@ -89,6 +89,13 @@ SELECT EXISTS (
     WHERE c.version = 1
       AND c.bitcoin_1_signature IS NOT NULL
       AND n.pub_key = $1
+    UNION ALL
+    SELECT 1
+    FROM graph_channels c
+    JOIN graph_nodes n ON n.id = c.node_id_2
+    WHERE c.version = 1
+      AND c.bitcoin_1_signature IS NOT NULL
+      AND n.pub_key = $1
 );
 
 -- name: DeleteUnconnectedNodes :many