diff --git a/drivers/filesystems/vfatfs/volume.c b/drivers/filesystems/vfatfs/volume.c
index e1eba1fd2a7..d1f10d05646 100644
--- a/drivers/filesystems/vfatfs/volume.c
+++ b/drivers/filesystems/vfatfs/volume.c
@@ -100,13 +100,14 @@ FsdGetFsAttributeInformation(
     ASSERT(*BufferLength >= sizeof(FILE_FS_ATTRIBUTE_INFORMATION));
     *BufferLength -= FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName);
 
-    if (DeviceExt->FatInfo.FatType == FAT32)
+    switch (DeviceExt->FatInfo.FatType)
     {
-        pName = L"FAT32";
-    }
-    else
-    {
-        pName = L"FAT";
+        case FAT12: pName = L"FAT"; break;
+        case FAT16: pName = L"FAT"; break;
+        case FAT32: pName = L"FAT32"; break;
+        case FATX16: pName = L"FATX"; break;
+        case FATX32: pName = L"FATX"; break;
+        default: return STATUS_NOT_SUPPORTED;
     }
 
     Length = wcslen(pName) * sizeof(WCHAR);