diff --git a/modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/history/HistoricCaseInstanceQuery.java b/modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/history/HistoricCaseInstanceQuery.java
index c9360327052..d157d14a720 100644
--- a/modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/history/HistoricCaseInstanceQuery.java
+++ b/modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/history/HistoricCaseInstanceQuery.java
@@ -450,6 +450,16 @@ public interface HistoricCaseInstanceQuery extends Query<HistoricCaseInstanceQue
      * Instruct localization to fallback to more general locales including the default locale of the JVM if the specified locale is not found.
      */
     HistoricCaseInstanceQuery withLocalizationFallback();
+    
+    /**
+     * Perform the query without applying sorting parameters. By default sorting will be applied.
+     */
+    HistoricCaseInstanceQuery withoutSorting();
+    
+    /**
+     * Return only the id value of the case instances, to reduce any additional instance data to be returned.
+     */
+    HistoricCaseInstanceQuery returnIdsOnly();
 
     HistoricCaseInstanceQuery orderByCaseInstanceId();
     HistoricCaseInstanceQuery orderByCaseInstanceName();
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/DeleteHistoricCaseInstancesSequentialJobHandler.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/DeleteHistoricCaseInstancesSequentialJobHandler.java
index e43942d5422..705e36b0fb8 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/DeleteHistoricCaseInstancesSequentialJobHandler.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/DeleteHistoricCaseInstancesSequentialJobHandler.java
@@ -69,7 +69,7 @@ public void execute(JobEntity job, String configuration, VariableScope variableS
 
         HistoricCaseInstanceQuery query = config.getQuery();
         // In the synchronous deletion, we are always deleting the first elements
-        List<HistoricCaseInstance> historicCaseInstances = query.listPage(0, batchSize);
+        List<HistoricCaseInstance> historicCaseInstances = query.withoutSorting().returnIdsOnly().listPage(0, batchSize);
         ObjectNode resultNode = engineConfiguration.getObjectMapper().createObjectNode();
         Set<String> caseInstanceIdsToDelete = new HashSet<>();
         for (HistoricCaseInstance historicCaseInstance : historicCaseInstances) {
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/HistoricCaseInstanceQueryImpl.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/HistoricCaseInstanceQueryImpl.java
index ce5e1f2a12c..43ef38d276f 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/HistoricCaseInstanceQueryImpl.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/HistoricCaseInstanceQueryImpl.java
@@ -114,6 +114,8 @@ public class HistoricCaseInstanceQueryImpl extends AbstractVariableQueryImpl<His
     protected boolean inOrStatement;
     protected String locale;
     protected boolean withLocalizationFallback;
+    protected boolean withoutSorting;
+    protected boolean returnIdsOnly;
 
     public HistoricCaseInstanceQueryImpl() {
     }
@@ -824,8 +826,16 @@ public long executeCount(CommandContext commandContext) {
     @Override
     public List<HistoricCaseInstance> executeList(CommandContext commandContext) {
         ensureVariablesInitialized();
+        
+        if (withoutSorting) {
+            setIgnoreOrderBy();
+        }
+        
         List<HistoricCaseInstance> results;
-        if (includeCaseVariables) {
+        if (returnIdsOnly) {
+            results = cmmnEngineConfiguration.getHistoricCaseInstanceEntityManager().findIdsByCriteria(this);
+            
+        } else if (includeCaseVariables) {
             results = cmmnEngineConfiguration.getHistoricCaseInstanceEntityManager().findWithVariablesByQueryCriteria(this);
 
             if (caseInstanceId != null) {
@@ -1175,6 +1185,18 @@ public HistoricCaseInstanceQuery withLocalizationFallback() {
         this.withLocalizationFallback = true;
         return this;
     }
+    
+    @Override
+    public HistoricCaseInstanceQuery withoutSorting() {
+        this.withoutSorting = true;
+        return this;
+    }
+    
+    @Override
+    public HistoricCaseInstanceQuery returnIdsOnly() {
+        this.returnIdsOnly = true;
+        return this;
+    }
 
     public String getCaseDefinitionId() {
         return caseDefinitionId;
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricCaseInstanceEntityManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricCaseInstanceEntityManager.java
index 9bd717f3805..f86c6f66a1d 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricCaseInstanceEntityManager.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricCaseInstanceEntityManager.java
@@ -37,6 +37,8 @@ public interface HistoricCaseInstanceEntityManager extends EntityManager<Histori
     List<HistoricCaseInstance> findByCriteria(HistoricCaseInstanceQuery query);
 
     List<HistoricCaseInstance> findWithVariablesByQueryCriteria(HistoricCaseInstanceQuery query);
+    
+    List<HistoricCaseInstance> findIdsByCriteria(HistoricCaseInstanceQuery query);
 
     long countByCriteria(HistoricCaseInstanceQuery query);
     
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricCaseInstanceEntityManagerImpl.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricCaseInstanceEntityManagerImpl.java
index 61c9929e55f..a5a2b4780a4 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricCaseInstanceEntityManagerImpl.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricCaseInstanceEntityManagerImpl.java
@@ -65,6 +65,11 @@ public List<HistoricCaseInstance> findByCriteria(HistoricCaseInstanceQuery query
     public List<HistoricCaseInstance> findWithVariablesByQueryCriteria(HistoricCaseInstanceQuery query) {
         return dataManager.findWithVariablesByQueryCriteria((HistoricCaseInstanceQueryImpl) query);
     }
+    
+    @Override
+    public List<HistoricCaseInstance> findIdsByCriteria(HistoricCaseInstanceQuery query) {
+        return dataManager.findIdsByCriteria((HistoricCaseInstanceQueryImpl) query);
+    }
 
     @Override
     public long countByCriteria(HistoricCaseInstanceQuery query) {
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/HistoricCaseInstanceDataManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/HistoricCaseInstanceDataManager.java
index 271299e1caa..4b14883c7f7 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/HistoricCaseInstanceDataManager.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/HistoricCaseInstanceDataManager.java
@@ -37,6 +37,8 @@ public interface HistoricCaseInstanceDataManager extends DataManager<HistoricCas
     long countByCriteria(HistoricCaseInstanceQueryImpl query);
 
     List<HistoricCaseInstance> findWithVariablesByQueryCriteria(HistoricCaseInstanceQueryImpl historicCaseInstanceQuery);
+    
+    List<HistoricCaseInstance> findIdsByCriteria(HistoricCaseInstanceQueryImpl query);
 
     void deleteByCaseDefinitionId(String caseDefinitionId);
     
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisHistoricCaseInstanceDataManagerImpl.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisHistoricCaseInstanceDataManagerImpl.java
index 1171fb7df9e..5482d83f990 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisHistoricCaseInstanceDataManagerImpl.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisHistoricCaseInstanceDataManagerImpl.java
@@ -82,6 +82,12 @@ public List<HistoricCaseInstance> findWithVariablesByQueryCriteria(HistoricCaseI
         return getDbSqlSession().selectList("selectHistoricCaseInstancesWithVariablesByQueryCriteria", historicCaseInstanceQuery, getManagedEntityClass());
     }
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<HistoricCaseInstance> findIdsByCriteria(HistoricCaseInstanceQueryImpl query) {
+        setSafeInValueLists(query);
+        return getDbSqlSession().selectList("selectHistoricCaseInstanceIdsByQueryCriteria", query, getManagedEntityClass());
+    }
 
     @Override
     public void deleteByCaseDefinitionId(String caseDefinitionId) {
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
index eb7ebe4b3d8..5ab80379726 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
@@ -182,6 +182,10 @@
         <result property="caseDefinitionVersion" column="CaseDefinitionVersion" jdbcType="INTEGER" />
         <result property="caseDefinitionDeploymentId" column="CaseDefinitionDeploymentId" jdbcType="VARCHAR" />
     </resultMap>
+    
+    <resultMap id="historicCaseInstanceIdResultMap" type="org.flowable.cmmn.engine.impl.persistence.entity.HistoricCaseInstanceEntityImpl">
+        <id property="id" column="ID_" jdbcType="VARCHAR" />
+    </resultMap>
 
     <resultMap id="historicCaseInstanceResultMapWithVariables"
                type="org.flowable.cmmn.engine.impl.persistence.entity.HistoricCaseInstanceEntityImpl"
@@ -247,6 +251,13 @@
         select count(distinct RES.ID_)
         <include refid="selectHistoricCaseInstancesByQueryCriteriaSql" />
     </select>
+    
+    <select id="selectHistoricCaseInstanceIdsByQueryCriteria" parameterType="org.flowable.cmmn.engine.impl.history.HistoricCaseInstanceQueryImpl" resultMap="historicCaseInstanceIdResultMap">
+        <if test="needsPaging">${limitBefore}</if>
+        select RES.ID_ <if test="needsPaging">${limitBetween}</if>
+        <include refid="selectHistoricCaseInstancesByQueryCriteriaSql" />
+        <if test="needsPaging">${limitAfter}</if>
+    </select>
 
     <select id="selectHistoricCaseInstancesWithVariablesByQueryCriteria"
             parameterType="org.flowable.cmmn.engine.impl.history.HistoricCaseInstanceQueryImpl"
diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoricCaseInstanceQueryImplTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoricCaseInstanceQueryImplTest.java
index a0ba0d005d8..fa25fb217d4 100644
--- a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoricCaseInstanceQueryImplTest.java
+++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoricCaseInstanceQueryImplTest.java
@@ -2025,4 +2025,42 @@ public void testQueryByParentScopeId() {
                 );
     }
 
+    @Test
+    public void getCaseInstanceIdByCaseDefinitionKey() {
+        CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder()
+                .caseDefinitionKey("oneTaskCase")
+                .start();
+
+        if (CmmnHistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, cmmnEngineConfiguration)) {
+            HistoricCaseInstance historicCaseInstance = cmmnHistoryService.createHistoricCaseInstanceQuery().caseDefinitionKey("oneTaskCase").withoutSorting().returnIdsOnly().singleResult();
+            assertThat(historicCaseInstance.getId()).isEqualTo(caseInstance.getId());
+            assertThat(historicCaseInstance.getCaseDefinitionId()).isNull();
+            
+            historicCaseInstance = cmmnHistoryService.createHistoricCaseInstanceQuery().caseDefinitionKey("oneTaskCase").withoutSorting().singleResult();
+            assertThat(historicCaseInstance.getId()).isEqualTo(caseInstance.getId());
+            assertThat(historicCaseInstance.getCaseDefinitionId()).isNotNull();
+
+            historicCaseInstance = cmmnHistoryService.createHistoricCaseInstanceQuery()
+                    .or()
+                    .caseDefinitionKey("oneTaskCase")
+                    .caseInstanceId("undefined")
+                    .endOr()
+                    .withoutSorting()
+                    .returnIdsOnly()
+                    .singleResult();
+            assertThat(historicCaseInstance.getId()).isEqualTo(caseInstance.getId());
+            assertThat(historicCaseInstance.getCaseDefinitionId()).isNull();
+            
+            historicCaseInstance = cmmnHistoryService.createHistoricCaseInstanceQuery()
+                    .or()
+                    .caseDefinitionKey("oneTaskCase")
+                    .caseInstanceId("undefined")
+                    .endOr()
+                    .withoutSorting()
+                    .singleResult();
+            
+            assertThat(historicCaseInstance.getId()).isEqualTo(caseInstance.getId());
+            assertThat(historicCaseInstance.getCaseDefinitionId()).isNotNull();
+        }
+    }
 }
diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoryDataDeleteTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoryDataDeleteTest.java
index c8ae1c59505..3141ac92f1b 100644
--- a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoryDataDeleteTest.java
+++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoryDataDeleteTest.java
@@ -902,6 +902,8 @@ public void testDeleteHistoricInstancesWithAllQueryOptions() throws InvocationTa
         methodsToIgnore.add("includeCaseVariables");
         methodsToIgnore.add("locale");
         methodsToIgnore.add("withLocalizationFallback");
+        methodsToIgnore.add("returnIdsOnly");
+        methodsToIgnore.add("withoutSorting");
         methodsToIgnore.add("asc");
         methodsToIgnore.add("desc");
         methodsToIgnore.add("or");
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/ListQueryParameterObject.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/ListQueryParameterObject.java
index 85268c2e839..1c20e6e3140 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/ListQueryParameterObject.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/ListQueryParameterObject.java
@@ -68,6 +68,8 @@ public NullHandlingOnOrder getNullHandlingOnOrder() {
     protected Collection<OrderBy> orderByCollection;
     protected OrderBy defaultOrderBy = DEFAULT_ORDER_BY;
     protected QueryProperty orderProperty;
+    // Only needed for DB2 and MSSQL queries for the over statement
+    protected boolean ignoreOrderBy;
     protected String nullHandlingColumn;
     protected NullHandlingOnOrder nullHandlingOnOrder;
     protected ResultType resultType;
@@ -138,6 +140,10 @@ public boolean hasOrderBy() {
 
         return defaultOrderBy != null;
     }
+    
+    public void setIgnoreOrderBy() {
+        this.ignoreOrderBy = true;
+    }
 
     // This is used for the SQL Server and DB2 order by in a window function / over
     @SuppressWarnings("unused")
@@ -146,6 +152,10 @@ public String getOrderByForWindow() {
     }
 
     protected String buildOrderBy() {
+        if (ignoreOrderBy) {
+            return "";
+        }
+        
         Collection<OrderBy> orderBy = getOrderByCollectionSafe();
 
         if (orderBy.isEmpty()) {
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/history/HistoricProcessInstanceQuery.java b/modules/flowable-engine/src/main/java/org/flowable/engine/history/HistoricProcessInstanceQuery.java
index d24c192c808..6d27cafcb31 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/history/HistoricProcessInstanceQuery.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/history/HistoricProcessInstanceQuery.java
@@ -582,4 +582,14 @@ public interface HistoricProcessInstanceQuery extends Query<HistoricProcessInsta
      * Instruct localization to fallback to more general locales including the default locale of the JVM if the specified locale is not found.
      */
     HistoricProcessInstanceQuery withLocalizationFallback();
+    
+    /**
+     * Perform the query without applying sorting parameters. By default sorting will be applied.
+     */
+    HistoricProcessInstanceQuery withoutSorting();
+    
+    /**
+     * Return only the id value of the process instances, to reduce any additional instance data to be returned.
+     */
+    HistoricProcessInstanceQuery returnIdsOnly();
 }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/HistoricProcessInstanceQueryImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/HistoricProcessInstanceQueryImpl.java
index 7cc0c1750ca..bc6b804a86b 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/HistoricProcessInstanceQueryImpl.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/HistoricProcessInstanceQueryImpl.java
@@ -113,6 +113,8 @@ public class HistoricProcessInstanceQueryImpl extends AbstractVariableQueryImpl<
     protected String referenceType;
     protected String locale;
     protected boolean withLocalizationFallback;
+    protected boolean withoutSorting;
+    protected boolean returnIdsOnly;
     protected List<HistoricProcessInstanceQueryImpl> orQueryObjects = new ArrayList<>();
     protected HistoricProcessInstanceQueryImpl currentOrQueryObject;
     protected boolean inOrStatement;
@@ -990,7 +992,19 @@ public HistoricProcessInstanceQuery locale(String locale) {
 
     @Override
     public HistoricProcessInstanceQuery withLocalizationFallback() {
-        withLocalizationFallback = true;
+        this.withLocalizationFallback = true;
+        return this;
+    }
+    
+    @Override
+    public HistoricProcessInstanceQuery withoutSorting() {
+        this.withoutSorting = true;
+        return this;
+    }
+    
+    @Override
+    public HistoricProcessInstanceQuery returnIdsOnly() {
+        this.returnIdsOnly = true;
         return this;
     }
 
@@ -1070,13 +1084,21 @@ public long executeCount(CommandContext commandContext) {
     @Override
     public List<HistoricProcessInstance> executeList(CommandContext commandContext) {
         ensureVariablesInitialized();
+        
+        if (withoutSorting) {
+            setIgnoreOrderBy();
+        }
+        
         List<HistoricProcessInstance> results = null;
         
         if (processEngineConfiguration.getHistoricProcessInstanceQueryInterceptor() != null) {
             processEngineConfiguration.getHistoricProcessInstanceQueryInterceptor().beforeHistoricProcessInstanceQueryExecute(this);
         }
         
-        if (includeProcessVariables) {
+        if (returnIdsOnly) {
+            results = processEngineConfiguration.getHistoricProcessInstanceEntityManager().findHistoricProcessInstanceIdsByQueryCriteria(this);
+            
+        } else if (includeProcessVariables) {
             results = processEngineConfiguration.getHistoricProcessInstanceEntityManager().findHistoricProcessInstancesAndVariablesByQueryCriteria(this);
 
             if (processInstanceId != null) {
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/DeleteHistoricProcessInstancesSequentialJobHandler.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/DeleteHistoricProcessInstancesSequentialJobHandler.java
index 63db789e64d..fda1972cc36 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/DeleteHistoricProcessInstancesSequentialJobHandler.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/DeleteHistoricProcessInstancesSequentialJobHandler.java
@@ -69,7 +69,7 @@ public void execute(JobEntity job, String configuration, VariableScope variableS
 
         HistoricProcessInstanceQuery query = config.getQuery();
         // In the synchronous deletion, we are always deleting the first elements
-        List<HistoricProcessInstance> historicProcessInstances = query.listPage(0, batchSize);
+        List<HistoricProcessInstance> historicProcessInstances = query.withoutSorting().returnIdsOnly().listPage(0, batchSize);
         ObjectNode resultNode = engineConfiguration.getObjectMapper().createObjectNode();
         Set<String> processInstanceIdsToDelete = new HashSet<>();
         for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/HistoricProcessInstanceEntityManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/HistoricProcessInstanceEntityManager.java
index 5762a22de72..f1cd95b1ad6 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/HistoricProcessInstanceEntityManager.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/HistoricProcessInstanceEntityManager.java
@@ -36,6 +36,8 @@ public interface HistoricProcessInstanceEntityManager extends EntityManager<Hist
 
     List<HistoricProcessInstance> findHistoricProcessInstancesAndVariablesByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
 
+    List<HistoricProcessInstance> findHistoricProcessInstanceIdsByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
+    
     List<HistoricProcessInstance> findHistoricProcessInstancesByNativeQuery(Map<String, Object> parameterMap);
 
     List<HistoricProcessInstance> findHistoricProcessInstancesBySuperProcessInstanceId(String historicProcessInstanceId);
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java
index e5a1ad8a9ae..fa38debd2ce 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java
@@ -46,16 +46,19 @@ public long findHistoricProcessInstanceCountByQueryCriteria(HistoricProcessInsta
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public List<HistoricProcessInstance> findHistoricProcessInstancesByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery) {
         return dataManager.findHistoricProcessInstancesByQueryCriteria(historicProcessInstanceQuery);
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public List<HistoricProcessInstance> findHistoricProcessInstancesAndVariablesByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery) {
         return dataManager.findHistoricProcessInstancesAndVariablesByQueryCriteria(historicProcessInstanceQuery);
     }
+    
+    @Override
+    public List<HistoricProcessInstance> findHistoricProcessInstanceIdsByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery) {
+        return dataManager.findHistoricProcessInstanceIdsByQueryCriteria(historicProcessInstanceQuery);
+    }
 
     @Override
     public List<HistoricProcessInstance> findHistoricProcessInstancesByNativeQuery(Map<String, Object> parameterMap) {
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/data/HistoricProcessInstanceDataManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/data/HistoricProcessInstanceDataManager.java
index df5eccafb5f..5fb38849237 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/data/HistoricProcessInstanceDataManager.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/data/HistoricProcessInstanceDataManager.java
@@ -40,6 +40,8 @@ public interface HistoricProcessInstanceDataManager extends DataManager<Historic
     List<HistoricProcessInstance> findHistoricProcessInstancesByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
 
     List<HistoricProcessInstance> findHistoricProcessInstancesAndVariablesByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
+    
+    List<HistoricProcessInstance> findHistoricProcessInstanceIdsByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
 
     List<HistoricProcessInstance> findHistoricProcessInstancesByNativeQuery(Map<String, Object> parameterMap);
 
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/data/impl/MybatisHistoricProcessInstanceDataManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/data/impl/MybatisHistoricProcessInstanceDataManager.java
index 928b3046c09..04b18918e64 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/data/impl/MybatisHistoricProcessInstanceDataManager.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/data/impl/MybatisHistoricProcessInstanceDataManager.java
@@ -86,6 +86,13 @@ public List<HistoricProcessInstance> findHistoricProcessInstancesAndVariablesByQ
         setSafeInValueLists(historicProcessInstanceQuery);
         return getDbSqlSession().selectList("selectHistoricProcessInstancesWithVariablesByQueryCriteria", historicProcessInstanceQuery, getManagedEntityClass());
     }
+    
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<HistoricProcessInstance> findHistoricProcessInstanceIdsByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery) {
+        setSafeInValueLists(historicProcessInstanceQuery);
+        return getDbSqlSession().selectList("selectHistoricProcessInstanceIdsByQueryCriteria", historicProcessInstanceQuery, getManagedEntityClass());
+    }
 
     @Override
     @SuppressWarnings("unchecked")
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
index a8189e4115b..968b1ee35fc 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
@@ -279,6 +279,10 @@
     <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR" />
   </resultMap>
   
+  <resultMap id="historicProcessInstanceIdResultMap" type="org.flowable.engine.impl.persistence.entity.HistoricProcessInstanceEntityImpl">
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+  </resultMap>
+  
   <resultMap id="historicProcessInstanceAndVariablesResultMap" type="org.flowable.engine.impl.persistence.entity.HistoricProcessInstanceEntityImpl">
     <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
@@ -382,6 +386,13 @@
         select count(distinct RES.ID_)
         <include refid="selectHistoricProcessInstancesByQueryCriteriaSql"/>
     </select>
+    
+    <select id="selectHistoricProcessInstanceIdsByQueryCriteria" parameterType="org.flowable.engine.impl.HistoricProcessInstanceQueryImpl" resultMap="historicProcessInstanceIdResultMap">
+        <if test="needsPaging">${limitBefore}</if>
+        SELECT RES.ID_ <if test="needsPaging">${limitBetween}</if>
+        <include refid="selectHistoricProcessInstancesByQueryCriteriaSql"/>
+        <if test="needsPaging">${limitAfter}</if>
+    </select>
 
     <sql id="selectHistoricProcessInstancesByQueryCriteriaSql">
         from ${prefix}ACT_HI_PROCINST RES
@@ -389,7 +400,7 @@
                 Doing a join on the definition table is OK, since it is a 1:1 relationship.
                 This has to be an outer join because historic data might exists, but definitions might have been deleted
         -->
-    left outer join ${prefix}ACT_RE_PROCDEF DEF on RES.PROC_DEF_ID_ = DEF.ID_
+        left outer join ${prefix}ACT_RE_PROCDEF DEF on RES.PROC_DEF_ID_ = DEF.ID_
     <include refid="commonSelectHistoricProcessInstancesByQueryCriteriaSql"/>
   </sql>
   
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/history/HistoricProcessInstanceQueryTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/history/HistoricProcessInstanceQueryTest.java
index 17b125ebde7..4f7d5ae2c02 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/history/HistoricProcessInstanceQueryTest.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/history/HistoricProcessInstanceQueryTest.java
@@ -557,4 +557,58 @@ public void testQueryByParentScopeId() {
                 );
     }
 
+    @Test
+    public void testIdQueryByDeploymentId() {
+        deployOneTaskTestProcess();
+        String deploymentId = repositoryService.createDeploymentQuery().singleResult().getId();
+        runtimeService.startProcessInstanceByKey("oneTaskProcess");
+        if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) {
+            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().deploymentId(deploymentId).withoutSorting().returnIdsOnly().singleResult();
+            assertThat(historicProcessInstance).isNotNull();
+            assertThat(historicProcessInstance.getId()).isNotNull();
+            assertThat(historicProcessInstance.getDeploymentId()).isNull();
+            assertThat(historicProcessInstance.getProcessDefinitionId()).isNull();
+            
+            historicProcessInstance = historyService.createHistoricProcessInstanceQuery().deploymentId(deploymentId).withoutSorting().singleResult();
+            assertThat(historicProcessInstance).isNotNull();
+            assertThat(historicProcessInstance.getId()).isNotNull();
+            assertThat(historicProcessInstance.getDeploymentId()).isNotNull();
+            assertThat(historicProcessInstance.getProcessDefinitionId()).isNotNull();
+            
+            historicProcessInstance = historyService.createHistoricProcessInstanceQuery().deploymentId(deploymentId).returnIdsOnly().singleResult();
+            assertThat(historicProcessInstance).isNotNull();
+            assertThat(historicProcessInstance.getId()).isNotNull();
+            
+            historicProcessInstance = historyService.createHistoricProcessInstanceQuery().deploymentId("nonexisting").returnIdsOnly().singleResult();
+            assertThat(historicProcessInstance).isNull();
+        }
+    }
+    
+    @Test
+    public void testIdQueryByInvolvedUser() {
+        deployOneTaskTestProcess();
+        ProcessInstance processInstance = runtimeService.createProcessInstanceBuilder()
+                .processDefinitionKey("oneTaskProcess")
+                .start();
+        runtimeService.addUserIdentityLink(processInstance.getId(), "kermit", "specialLink");
+
+        if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) {
+
+            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().involvedUser("kermit", "specialLink").withoutSorting().returnIdsOnly().singleResult();
+            assertThat(historicProcessInstance.getId()).isEqualTo(processInstance.getId());
+            assertThat(historicProcessInstance.getProcessDefinitionId()).isNull();
+            
+            historicProcessInstance = historyService.createHistoricProcessInstanceQuery().involvedUser("kermit", "specialLink").withoutSorting().singleResult();
+            assertThat(historicProcessInstance.getId()).isEqualTo(processInstance.getId());
+            assertThat(historicProcessInstance.getProcessDefinitionId()).isNotNull();
+
+            historicProcessInstance = historyService.createHistoricProcessInstanceQuery().or().involvedUser("kermit", "specialLink").processDefinitionKey("undefined").endOr().withoutSorting().returnIdsOnly().singleResult();
+            assertThat(historicProcessInstance.getId()).isEqualTo(processInstance.getId());
+            assertThat(historicProcessInstance.getProcessDefinitionId()).isNull();
+            
+            historicProcessInstance = historyService.createHistoricProcessInstanceQuery().or().involvedUser("kermit", "specialLink").processDefinitionKey("undefined").endOr().withoutSorting().singleResult();
+            assertThat(historicProcessInstance.getId()).isEqualTo(processInstance.getId());
+            assertThat(historicProcessInstance.getProcessDefinitionId()).isNotNull();
+        }
+    }
 }
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/HistoricDataDeleteTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/HistoricDataDeleteTest.java
index a62967da56d..6fba6da9f4a 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/HistoricDataDeleteTest.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/HistoricDataDeleteTest.java
@@ -1202,6 +1202,8 @@ void testDeleteHistoricInstancesWithAllQueryOptions() throws InvocationTargetExc
         methodsToIgnore.add("includeProcessVariables");
         methodsToIgnore.add("locale");
         methodsToIgnore.add("withLocalizationFallback");
+        methodsToIgnore.add("withoutSorting");
+        methodsToIgnore.add("returnIdsOnly");
         methodsToIgnore.add("asc");
         methodsToIgnore.add("desc");
         methodsToIgnore.add("or");
diff --git a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/persistence/entity/data/impl/MybatisJobDataManager.java b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/persistence/entity/data/impl/MybatisJobDataManager.java
index 175c7888b6e..0ba0f373835 100644
--- a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/persistence/entity/data/impl/MybatisJobDataManager.java
+++ b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/persistence/entity/data/impl/MybatisJobDataManager.java
@@ -21,6 +21,7 @@
 import org.flowable.common.engine.impl.cfg.IdGenerator;
 import org.flowable.common.engine.impl.db.AbstractDataManager;
 import org.flowable.common.engine.impl.db.DbSqlSession;
+import org.flowable.common.engine.impl.db.ListQueryParameterObject;
 import org.flowable.common.engine.impl.db.SingleCachedEntityMatcher;
 import org.flowable.common.engine.impl.persistence.cache.CachedEntityMatcher;
 import org.flowable.job.api.Job;
@@ -66,7 +67,10 @@ public List<JobEntity> findJobsToExecute(List<String> enabledCategories, Page pa
         if (enabledCategories != null && enabledCategories.size() > 0) {
             params.put("enabledCategories", enabledCategories);
         }
-        return getDbSqlSession().selectList("selectJobsToExecute", params, page);
+        
+        ListQueryParameterObject listQueryParameterObject = new ListQueryParameterObject(params, page.getFirstResult(), page.getMaxResults());
+        listQueryParameterObject.setIgnoreOrderBy();
+        return getDbSqlSession().selectList("selectJobsToExecute", listQueryParameterObject);
     }
 
     @Override
@@ -103,7 +107,10 @@ public List<JobEntity> findExpiredJobs(List<String> enabledCategories, Page page
         if (enabledCategories != null && enabledCategories.size() > 0) {
             params.put("enabledCategories", enabledCategories);
         }
-        return getDbSqlSession().selectList("selectExpiredJobs", params, page);
+        
+        ListQueryParameterObject listQueryParameterObject = new ListQueryParameterObject(params, page.getFirstResult(), page.getMaxResults());
+        listQueryParameterObject.setIgnoreOrderBy();
+        return getDbSqlSession().selectList("selectExpiredJobs", listQueryParameterObject);
     }
 
     @Override
diff --git a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/persistence/entity/data/impl/MybatisTimerJobDataManager.java b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/persistence/entity/data/impl/MybatisTimerJobDataManager.java
index a33c30a0b4f..e1399764a20 100644
--- a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/persistence/entity/data/impl/MybatisTimerJobDataManager.java
+++ b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/persistence/entity/data/impl/MybatisTimerJobDataManager.java
@@ -21,6 +21,7 @@
 import org.flowable.common.engine.impl.cfg.IdGenerator;
 import org.flowable.common.engine.impl.db.AbstractDataManager;
 import org.flowable.common.engine.impl.db.DbSqlSession;
+import org.flowable.common.engine.impl.db.ListQueryParameterObject;
 import org.flowable.common.engine.impl.db.SingleCachedEntityMatcher;
 import org.flowable.common.engine.impl.persistence.cache.CachedEntityMatcher;
 import org.flowable.job.api.Job;
@@ -89,7 +90,10 @@ public List<TimerJobEntity> findExpiredJobs(List<String> enabledCategories, Page
         if (enabledCategories != null && enabledCategories.size() > 0) {
             params.put("enabledCategories", enabledCategories);
         }
-        return getDbSqlSession().selectList("selectExpiredTimerJobs", params, page);
+        
+        ListQueryParameterObject listQueryParameterObject = new ListQueryParameterObject(params, page.getFirstResult(), page.getMaxResults());
+        listQueryParameterObject.setIgnoreOrderBy();
+        return getDbSqlSession().selectList("selectExpiredTimerJobs", listQueryParameterObject);
     }
 
     @Override
@@ -113,7 +117,10 @@ public List<TimerJobEntity> findJobsToExecute(List<String> enabledCategories, Pa
         if (enabledCategories != null && enabledCategories.size() > 0) {
             params.put("enabledCategories", enabledCategories);
         }
-        return getDbSqlSession().selectList("selectTimerJobsToExecute", params, page);
+        
+        ListQueryParameterObject listQueryParameterObject = new ListQueryParameterObject(params, page.getFirstResult(), page.getMaxResults());
+        listQueryParameterObject.setIgnoreOrderBy();
+        return getDbSqlSession().selectList("selectTimerJobsToExecute", listQueryParameterObject);
     }
 
     @Override
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml
index 18233badc12..ab24cf1c5b5 100755
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml
@@ -69,7 +69,6 @@
                 </foreach>
             </if>
         </where>
-        ${orderBy}
         <if test="needsPaging">${limitAfter}</if>
     </select>
     
@@ -92,7 +91,6 @@
                 </foreach>
             </if>
         </where>
-        ${orderBy}
         <if test="needsPaging">${limitAfter}</if>
     </select>
     
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml
index 53f7a5dd1e1..1999c51a8e5 100644
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml
@@ -191,7 +191,6 @@
                 #{category, jdbcType=VARCHAR}
             </foreach>
         </if>
-        ${orderBy}
         <if test="needsPaging">${limitAfter}</if>
     </select>
 
@@ -215,7 +214,6 @@
                 </foreach>
             </if>
         </where>
-        ${orderBy}
         <if test="needsPaging">${limitAfter}</if>
     </select>