:: commit 1e2b85111fa9e1c311b3420f7ad0dd9311bda885

diff --git a/common/mm/pmm.s2.c b/common/mm/pmm.s2.c
index 387e64c9..185a63ae 100644
--- a/common/mm/pmm.s2.c
+++ b/common/mm/pmm.s2.c
@@ -164,7 +164,7 @@ void pmm_sanitise_entries(struct memmap_entry *m, size_t *_count, bool align_ent
         if (!m[i].length
          || (align_entries && !align_entry(&m[i].base, &m[i].length))) {
             // Remove i from memmap
-            if (i < count) {
+            if (i < count - 1) {
                 m[i] = m[count - 1];
             }
             count--; i--;