diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
index 23c784b0b9..07e157df4e 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
@@ -760,16 +760,14 @@ FreeDefaultList (
   LIST_ENTRY *Link;
   UEFI_IFR_BUFFER_STORAGE_NODE *Default;
 
-  Link = GetFirstNode (ListHead);
-  
-  while (!IsNull (ListHead, Link)) {
+  while (!IsListEmpty (ListHead)) {
+    Link = GetFirstNode (ListHead);
+    
     Default = UEFI_IFR_BUFFER_STORAGE_NODE_FROM_LIST(Link);
 
     RemoveEntryList (Link);
    
     DestroyDefaultNode (Default);
-    
-    Link = GetNextNode (ListHead, Link);
   }
 
   FreePool (ListHead);