diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c
index ed1c4bf391..4f187e3abb 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c
@@ -129,7 +129,7 @@ EnumerateNvmeDevNamespace (
     Device->Media.WriteCaching   = FALSE;
 
     Flbas     = NamespaceData->Flbas;
-    LbaFmtIdx = Flbas & 3;
+    LbaFmtIdx = Flbas & 0xF;
     Lbads     = NamespaceData->LbaFormat[LbaFmtIdx].Lbads;
     Device->Media.BlockSize = (UINT32)1 << Lbads;