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 d9659e312e..9b4d988e7a 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
@@ -446,6 +446,21 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
             {
                 this.numberFound = numberFound;
             }
+
+            @Override
+            public boolean hasMore()
+            {
+                /*
+                Overriding for MNT-20822
+                Changing code to correct the hasMore field in the search api response.
+                Basing off the implementation in SolrJSONResultSet with changes due to
+                numberFound being equal to skip + count rather than an accurate number 
+                of possible results
+                 */
+                return getUnFilteredResultSet().length() >= getResultSetMetaData()
+                    .getSearchParameters()
+                    .getMaxItems();
+            }
         }
 
         BitSet inclusionMask = new BitSet(returnedObject.length());