diff --git a/src/sys/dirctl.c b/src/sys/dirctl.c
index 3063f256..c6f3ab20 100644
--- a/src/sys/dirctl.c
+++ b/src/sys/dirctl.c
@@ -512,7 +512,8 @@ static NTSTATUS FspFsvolQueryDirectoryRetry(
     }
 
     /* set the DirectoryPattern in the FileDesc */
-    Result = FspFileDescResetDirectoryPattern(FileDesc, FileName, RestartScan);
+    Result = FspFileDescResetDirectoryPattern(FileDesc, FileName,
+        RestartScan && 0 != FileName && 0 != FileName->Length);
     if (!NT_SUCCESS(Result))
     {
         FspFileNodeRelease(FileNode, Full);