diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
index 386ff327f8..2d456da303 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
@@ -494,7 +494,7 @@ HiiGetSecondaryLanguages (
   UnicodeStrToAsciiStr (PrimaryLanguage, PrimaryLang639);
 
   PrimaryLang4646 = ConvertLanguagesIso639ToRfc4646 (PrimaryLang639);
-  ASSERT_EFI_ERROR (PrimaryLang4646 != NULL);
+  ASSERT (PrimaryLang4646 != NULL);
 
   SecLangCodes4646 = HiiGetSupportedSecondaryLanguages (UefiHiiHandle, PrimaryLang4646);
 
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
index f6d97f6344..d269b8e4d6 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
@@ -153,7 +153,7 @@ ExportPackageLists (
                            &Size,
                            PackageListHdr
                            );
-  ASSERT_EFI_ERROR (Status != EFI_BUFFER_TOO_SMALL);
+  ASSERT (Status != EFI_BUFFER_TOO_SMALL);
   
   if (Status == EFI_BUFFER_TOO_SMALL) {
     PackageListHdr = AllocateZeroPool (Size);