diff --git a/source/java/org/alfresco/repo/webdav/WebDAVServlet.java b/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
index 3e0039ca69..94af463f75 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
@@ -221,7 +221,7 @@ public class WebDAVServlet extends HttpServlet
                 // Create the handler method
                 
                 method = (WebDAVMethod) methodClass.newInstance();
-                NodeRef rootNodeRef = null;
+                NodeRef rootNodeRef = m_rootNodeRef;
                 if (m_tenantService.isEnabled())
                 {
                     WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
@@ -229,12 +229,9 @@ public class WebDAVServlet extends HttpServlet
                     SearchService searchService = (SearchService) context.getBean("SearchService");
                     NamespaceService namespaceService = (NamespaceService) context.getBean("NamespaceService");
 
+                    // note: rootNodeRef is required (for storeRef part)
                     rootNodeRef = m_tenantService.getRootNode(nodeService, searchService, namespaceService, m_rootPath, rootNodeRef);
                 }
-                else
-                {
-                	rootNodeRef = m_rootNodeRef;
-                }
 
                 method.setDetails(request, response, m_davHelper, rootNodeRef);
             }