diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
index de4dc4786c..592c6611cd 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
@@ -1126,7 +1126,7 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
                 // Check if the folder is empty                        
                 // Get pseudo files
                 PseudoFileList pseudoFileList = new PseudoFileList();
-                if (ctx.isPseudoFilesEnabled())
+                if (session.isPseudoFilesEnabled() && ctx.isPseudoFilesEnabled())
                 {
                     pseudoFileList = ctx.getPseudoFileOverlay().searchPseudoFiles(nodeRef, "*");
                 }