diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
index 4bb922762c..27c88844d9 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
@@ -291,8 +291,7 @@ public class SolrQueryHTTPClient implements BeanFactoryAware
                 {
                     sortBuffer.append(encoder.encode(", ", "UTF-8"));
                 }
-                // MNT-8557 fix, manually replace ' ' with '%20'
-                sortBuffer.append(encoder.encode(sortDefinition.getField().replaceAll(" ", "%20"), "UTF-8")).append(encoder.encode(" ", "UTF-8"));
+                sortBuffer.append(encoder.encode(sortDefinition.getField(), "UTF-8")).append(encoder.encode(" ", "UTF-8"));
                 if (sortDefinition.isAscending())
                 {
                     sortBuffer.append(encoder.encode("asc", "UTF-8"));