diff --git a/source/java/org/alfresco/web/bean/AdvancedSearchBean.java b/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
index 83f9dd9130..d377e7f2d5 100644
--- a/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
+++ b/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
@@ -1375,7 +1375,7 @@ public class AdvancedSearchBean
       {
          xpath = xpath.substring(0, xpath.lastIndexOf("/*"));
       }
-      NodeRef rootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
+      NodeRef rootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId(FacesContext.getCurrentInstance()));
       List<NodeRef> results = null;
       try
       {