diff --git a/nuxeo-automation/nuxeo-automation-core/src/main/java/org/nuxeo/ecm/automation/core/operations/document/Query.java b/nuxeo-automation/nuxeo-automation-core/src/main/java/org/nuxeo/ecm/automation/core/operations/document/Query.java
index 36d2af96ae..c0569590c7 100644
--- a/nuxeo-automation/nuxeo-automation-core/src/main/java/org/nuxeo/ecm/automation/core/operations/document/Query.java
+++ b/nuxeo-automation/nuxeo-automation-core/src/main/java/org/nuxeo/ecm/automation/core/operations/document/Query.java
@@ -31,7 +31,7 @@
 @Operation(id = Query.ID, category = Constants.CAT_FETCH, label = "Query",
         description = "Perform a query on the repository. The query result " +
                 "will become the input for the next operation.",
-        addToStudio = true, deprecatedSince = "5.9.6")
+        addToStudio = false, deprecatedSince = "5.9.6")
 public class Query {
 
     public static final String ID = "Document.Query";
diff --git a/nuxeo-automation/nuxeo-automation-core/src/main/resources/OSGI-INF/operations-contrib.xml b/nuxeo-automation/nuxeo-automation-core/src/main/resources/OSGI-INF/operations-contrib.xml
index bfe0c2cc78..5a4e27bafa 100644
--- a/nuxeo-automation/nuxeo-automation-core/src/main/resources/OSGI-INF/operations-contrib.xml
+++ b/nuxeo-automation/nuxeo-automation-core/src/main/resources/OSGI-INF/operations-contrib.xml
@@ -50,23 +50,6 @@
       class="org.nuxeo.ecm.automation.core.operations.document.DeleteDocument" />
     <operation class="org.nuxeo.ecm.automation.core.operations.document.FetchDocument" />
     <operation class="org.nuxeo.ecm.automation.core.operations.document.LockDocument" />
-    <operation class="org.nuxeo.ecm.automation.core.operations.document.Query">
-      <widgets>
-        <widget name="query" type="codearea">
-          <labels>
-            <label mode="any">Query</label>
-          </labels>
-          <properties mode="any">
-            <property name="language">nxql</property>
-            <property name="width">100%</property>
-            <property name="height">100%</property>
-          </properties>
-          <fields>
-            <field>query</field>
-          </fields>
-        </widget>
-      </widgets>
-    </operation>
     <operation
       class="org.nuxeo.ecm.automation.core.operations.document.FetchByProperty" />
     <operation
diff --git a/nuxeo-automation/nuxeo-automation-features/src/main/java/org/nuxeo/ecm/automation/core/operations/services/query/DocumentPaginatedQuery.java b/nuxeo-automation/nuxeo-automation-features/src/main/java/org/nuxeo/ecm/automation/core/operations/services/query/DocumentPaginatedQuery.java
index 37774a02fa..53c8b7c9e2 100644
--- a/nuxeo-automation/nuxeo-automation-features/src/main/java/org/nuxeo/ecm/automation/core/operations/services/query/DocumentPaginatedQuery.java
+++ b/nuxeo-automation/nuxeo-automation-features/src/main/java/org/nuxeo/ecm/automation/core/operations/services/query/DocumentPaginatedQuery.java
@@ -49,7 +49,7 @@
         "operation.", since = "5.9.6", addToStudio = true)
 public class DocumentPaginatedQuery {
 
-    public static final String ID = "Document.PaginatedQuery";
+    public static final String ID = "Document.Query";
 
     public static final String CURRENT_USERID_PATTERN = "$currentUser";