From ea4cd06e2334b24a2d254b59b4e1810269c4494e Mon Sep 17 00:00:00 2001
From: piergm <134913285+piergm@users.noreply.github.com>
Date: Thu, 23 Oct 2025 11:47:03 +0200
Subject: [PATCH] Sets CPSMode(true) only if CPS is enabled and searchRequest
 is allowCrossProject

---
 .../org/elasticsearch/rest/action/search/RestSearchAction.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
index 2c52b92dfda7e..b369dbc450624 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
@@ -245,7 +245,7 @@ public static void parseSearchRequest(
         searchRequest.routing(request.param("routing"));
         searchRequest.preference(request.param("preference"));
         IndicesOptions indicesOptions = IndicesOptions.fromRequest(request, searchRequest.indicesOptions());
-        if (crossProjectEnabled) {
+        if (crossProjectEnabled && searchRequest.allowsCrossProject()) {
             indicesOptions = IndicesOptions.builder(indicesOptions)
                 .crossProjectModeOptions(new IndicesOptions.CrossProjectModeOptions(true))
                 .build();