diff --git a/Changelog.md b/Changelog.md
index 6f273447..67c979eb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,6 +16,7 @@ OpenCore Changelog
 - Added `EnableVmx` quirk to allow virtualization in other OS on some Macs
 - Upgraded `ProtectUefiServices` to prevent GRUB shim overwriting service pointers when chainloading with Secure Boot enabled
 - Removed deprecated SSDT-PNLFCFL
+- Fixed handling of zero-sized Memory Attributes Table
 
 #### v0.7.5
 - Revised OpenLinuxBoot documentation
diff --git a/Library/OcMemoryLib/MemoryAttributes.c b/Library/OcMemoryLib/MemoryAttributes.c
index e0f00646..4e2c7f08 100644
--- a/Library/OcMemoryLib/MemoryAttributes.c
+++ b/Library/OcMemoryLib/MemoryAttributes.c
@@ -438,7 +438,7 @@ OcRebuildAttributes (
   UINT32                             DescriptorVersion;
 
   MemoryAttributesTable = OcGetMemoryAttributes (&MemoryAttributesEntry);
-  if (MemoryAttributesTable == NULL) {
+  if (MemoryAttributesTable == NULL || MemoryAttributesTable->NumberOfEntries == 0) {
     return EFI_UNSUPPORTED;
   }