diff --git a/repository/src/main/java/org/alfresco/repo/jscript/People.java b/repository/src/main/java/org/alfresco/repo/jscript/People.java
index cf60590456..40133343e0 100644
--- a/repository/src/main/java/org/alfresco/repo/jscript/People.java
+++ b/repository/src/main/java/org/alfresco/repo/jscript/People.java
@@ -585,9 +585,11 @@ public class People extends BaseScopableProcessorExtension implements Initializi
         boolean useCQ = false;
         if (filter != null)
         {
-
-            useCQ = honorHintUseCQ;
-            filter = filter.substring(0, filter.length()-HINT_CQ_SUFFIX.length());
+            if (filter.endsWith(HINT_CQ_SUFFIX))
+            {
+                useCQ = honorHintUseCQ;
+                filter = filter.substring(0, filter.length()-HINT_CQ_SUFFIX.length());
+            }
         }
         else
         {