diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml
index a9d685211f..a4e8453a59 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml
@@ -105,6 +105,7 @@
                 </foreach>
             </if>
         <if test="hasOrderBy">
+          <if test="hasPredicatePartsOrder">
             order by
             <foreach item="item" index="index" collection="predicateParts" open="" separator="," close="">
                  <choose>
@@ -114,6 +115,7 @@
                      </when>
                  </choose>
             </foreach>
+          </if>
         </if>    
     </sql>
 
diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
index 8cf5a6e3f2..e7cbabf062 100644
--- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
+++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
@@ -158,6 +158,20 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent
         return predicatePartCommands;
     }
 
+    public boolean getHasPredicatePartsOrder()
+    {
+        boolean hasPredicatePartsOrder = false;
+        List<DBQueryBuilderPredicatePartCommand> predicateParts = getPredicateParts();
+        if (predicateParts != null)
+        {
+            for(DBQueryBuilderPredicatePartCommand item : predicateParts)
+            {
+                hasPredicatePartsOrder = hasPredicatePartsOrder || "ORDER".equals(item.getType());
+            }
+        }
+        return hasPredicatePartsOrder;
+    }
+
     /*
      * (non-Javadoc)
      * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#isSupported()