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 14aea6c167..22cd5f3fce 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
@@ -401,7 +401,11 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
             url.append(httpClientAndBaseUrl.getSecond());
          
             String languageUrlFragment = extractLanguageFragment(language);
-            url.append("/").append(languageUrlFragment);
+            if(!url.toString().endsWith("/"))
+            {
+                url.append("/");
+            }
+            url.append(languageUrlFragment);
 
             // Send the query in JSON only
             // url.append("?q=");