diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c
index 46c006d0a7c..15e4a2d28cc 100644
--- a/sdk/lib/drivers/rdbsslib/rdbss.c
+++ b/sdk/lib/drivers/rdbsslib/rdbss.c
@@ -8155,6 +8155,8 @@ RxQueryNameInfo(
         return STATUS_BUFFER_OVERFLOW;
     }
 
+    RxContext->Info.LengthRemaining -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName);
+
     Fcb = (PFCB)RxContext->pFcb;
     Fobx = (PFOBX)RxContext->pFobx;
     /* Get the UNC name */