diff --git a/drivers/storage/mountmgr/device.c b/drivers/storage/mountmgr/device.c
index 22710b7b4d7..7000d4a4218 100644
--- a/drivers/storage/mountmgr/device.c
+++ b/drivers/storage/mountmgr/device.c
@@ -1004,8 +1004,8 @@ TryWithVolumeName:
     Output = (PMOUNTMGR_VOLUME_PATHS)Irp->AssociatedIrp.SystemBuffer;
 
     /* At least, we will return our length */
-    Output->MultiSzLength = DeviceLength;
-    Irp->IoStatus.Information = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz) + DeviceLength;
+    Output->MultiSzLength = DeviceLength + 2 * sizeof(UNICODE_NULL);
+    Irp->IoStatus.Information = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz) + Output->MultiSzLength;
 
     /* If we have enough room for copying the string */
     if (Irp->IoStatus.Information <= Stack->Parameters.DeviceIoControl.OutputBufferLength)