diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index adeada2b29..730f51d435 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -859,10 +859,10 @@ IfrFind (
 
   Result->Type = EFI_IFR_TYPE_NUM_SIZE_64;
   if (Base >= StrLen (String[1])) {
-    Result->Value.u64 = 0xFFFFFFFFFFFFFFFF;
+    Result->Value.u64 = 0xFFFFFFFFFFFFFFFFULL;
   } else {
     StringPtr = StrStr (String[1] + Base, String[0]);
-    Result->Value.u64 = (StringPtr == NULL) ? 0xFFFFFFFFFFFFFFFF : (StringPtr - String[1]);
+    Result->Value.u64 = (StringPtr == NULL) ? 0xFFFFFFFFFFFFFFFFULL : (StringPtr - String[1]);
   }
 
 Done:
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 093ceff100..ed16d7b032 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -909,7 +909,7 @@ ParseOpCodes (
 
       case EFI_IFR_ONES_OP:
         Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;
-        Value->Value.u64 = 0xffffffffffffffff;
+        Value->Value.u64 = 0xffffffffffffffffULL;
         break;
 
       case EFI_IFR_UINT8_OP: