diff --git a/pwndbg/commands/heap.py b/pwndbg/commands/heap.py
index 0d1750bdb..24712eb55 100755
--- a/pwndbg/commands/heap.py
+++ b/pwndbg/commands/heap.py
@@ -80,6 +80,8 @@ def heap(addr=None):
 
         # Clear the bottom 3 bits
         size &= ~7
+        if size == 0:
+            break
         addr += size
 
 @pwndbg.commands.ParsedCommand