diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
index 517fa9c655..44d168b8f1 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
@@ -422,6 +422,12 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
             return null;
         }
 
+        // FIXME see: RM-6895
+        if (returnedObject.getResultSetMetaData().getSearchParameters().getLanguage().equalsIgnoreCase("solr-sql"))
+        {
+            return returnedObject;
+        }
+
         class RMFilteringResultSet extends FilteringResultSet
         {
             private long numberFound;