diff --git a/drivers/filters/mountmgr/notify.c b/drivers/filters/mountmgr/notify.c
index 9a1e7885ac8..2c7a05dbc88 100644
--- a/drivers/filters/mountmgr/notify.c
+++ b/drivers/filters/mountmgr/notify.c
@@ -370,8 +370,9 @@ MountMgrNotifyNameChange(IN PDEVICE_EXTENSION DeviceExtension,
     if (ValidateVolume)
     {
         /* Then, ensure we can find the device */
-        NextEntry = DeviceExtension->DeviceListHead.Flink;
-        while (NextEntry != &(DeviceExtension->DeviceListHead))
+        for (NextEntry = DeviceExtension->DeviceListHead.Flink;
+             NextEntry != &DeviceExtension->DeviceListHead;
+             NextEntry = NextEntry->Flink)
         {
             DeviceInformation = CONTAINING_RECORD(NextEntry, DEVICE_INFORMATION, DeviceListEntry);
             if (RtlCompareUnicodeString(DeviceName, &(DeviceInformation->DeviceName), TRUE) == 0)