diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
index 26e1472c9..731f1913a 100644
--- a/grub-core/loader/arm64/xen_boot.c
+++ b/grub-core/loader/arm64/xen_boot.c
@@ -290,9 +290,9 @@ single_binary_unload (struct xen_boot_binary *binary)
 static void
 all_binaries_unload (void)
 {
-  struct xen_boot_binary *binary;
+  struct xen_boot_binary *binary, *next_binary;
 
-  FOR_LIST_ELEMENTS (binary, module_head)
+  FOR_LIST_ELEMENTS_SAFE (binary, next_binary, module_head)
   {
     single_binary_unload (binary);
   }