diff --git a/source/java/org/alfresco/web/app/servlet/BaseServlet.java b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
index f3807598e8..3775fe61a0 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
@@ -52,6 +52,13 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.jsf.FacesContextUtils;
 
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+
+
 /**
  * Base servlet class containing useful constant values and common methods for Alfresco servlets.
  * 
@@ -89,6 +96,8 @@ public abstract class BaseServlet extends HttpServlet
    
    private static Log logger = LogFactory.getLog(BaseServlet.class);
    
+   // Tenant service
+   private static TenantService m_tenantService;
    
    /**
     * Return the ServiceRegistry helper instance
@@ -291,6 +300,26 @@ public abstract class BaseServlet extends HttpServlet
          // get the company home node to start the search from
          nodeRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
          
+         m_tenantService = (TenantService) wc.getBean("tenantService");         
+         if (m_tenantService !=null && m_tenantService.isEnabled())
+         {
+        	 if (logger.isDebugEnabled())
+        	 {
+        	     logger.debug("MT is enabled.");
+        	 }
+        	 
+             NodeService nodeService = (NodeService) wc.getBean("NodeService");
+             SearchService searchService = (SearchService) wc.getBean("SearchService");
+             NamespaceService namespaceService = (NamespaceService) wc.getBean("NamespaceService");
+             
+             // TODO: since these constants are used more widely than just the WebDAVServlet, 
+             // they should be defined somewhere other than in that servlet
+             String m_rootPath = wc.getServletContext().getInitParameter(org.alfresco.repo.webdav.WebDAVServlet.KEY_ROOT_PATH);
+             
+             // note: rootNodeRef is required (for storeRef part)
+             nodeRef = m_tenantService.getRootNode(nodeService, searchService, namespaceService, m_rootPath, nodeRef);
+         }
+         
          if (paths.size() != 0)
          {
             FileFolderService ffs = (FileFolderService)wc.getBean("FileFolderService");
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index e4c34a5240..a03023a799 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -85,6 +85,19 @@
       <description>Spring config file locations</description>
    </context-param>
 
+	<!--  These were previously init params for the WebDAV servlet,
+	      but since they are also needed to MT-enable the 
+	      ExternalAccess servlet, I have made them context wide. -->
+   <context-param>
+         <param-name>store</param-name>
+         <param-value>workspace://SpacesStore</param-value>
+   </context-param>
+   <context-param>
+         <param-name>rootPath</param-name>
+         <param-value>/app:company_home</param-value>
+   </context-param>
+
+
    <filter>
       <filter-name>Authentication Filter</filter-name>
       <filter-class>org.alfresco.web.app.servlet.AuthenticationFilter</filter-class>
@@ -312,14 +325,6 @@
    <servlet>
       <servlet-name>WebDAV</servlet-name>
       <servlet-class>org.alfresco.repo.webdav.WebDAVServlet</servlet-class>
-      <init-param>
-         <param-name>store</param-name>
-         <param-value>workspace://SpacesStore</param-value>
-      </init-param>
-      <init-param>
-         <param-name>rootPath</param-name>
-         <param-value>/app:company_home</param-value>
-      </init-param>
       <load-on-startup>5</load-on-startup>
    </servlet>