diff --git a/Architecture/amd64/Bootstrap/Multiboot/2/Multiboot.cpp b/Architecture/amd64/Bootstrap/Multiboot/2/Multiboot.cpp
index f2f55b4..74b3729 100644
--- a/Architecture/amd64/Bootstrap/Multiboot/2/Multiboot.cpp
+++ b/Architecture/amd64/Bootstrap/Multiboot/2/Multiboot.cpp
@@ -114,7 +114,7 @@ EXTERNC void multiboot_main(uintptr_t Magic, uintptr_t Info)
                 mb2binfo.Memory.Entries = EntryCount;
                 for (uint32_t i = 0; i < EntryCount; i++)
                 {
-                    if (EntryCount > MAX_MEMORY_ENTRIES)
+                    if (i > MAX_MEMORY_ENTRIES)
                     {
                         warn("Too many memory entries, skipping the rest...");
                         break;
diff --git a/Architecture/i386/Bootstrap/Multiboot/2/Multiboot.cpp b/Architecture/i386/Bootstrap/Multiboot/2/Multiboot.cpp
index f2f55b4..74b3729 100644
--- a/Architecture/i386/Bootstrap/Multiboot/2/Multiboot.cpp
+++ b/Architecture/i386/Bootstrap/Multiboot/2/Multiboot.cpp
@@ -114,7 +114,7 @@ EXTERNC void multiboot_main(uintptr_t Magic, uintptr_t Info)
                 mb2binfo.Memory.Entries = EntryCount;
                 for (uint32_t i = 0; i < EntryCount; i++)
                 {
-                    if (EntryCount > MAX_MEMORY_ENTRIES)
+                    if (i > MAX_MEMORY_ENTRIES)
                     {
                         warn("Too many memory entries, skipping the rest...");
                         break;