diff --git a/MdePkg/Library/BaseLib/X64/DisableCache.S b/MdePkg/Library/BaseLib/X64/DisableCache.S
index 44f82bbe52..678290888e 100644
--- a/MdePkg/Library/BaseLib/X64/DisableCache.S
+++ b/MdePkg/Library/BaseLib/X64/DisableCache.S
@@ -31,9 +31,9 @@
 #------------------------------------------------------------------------------
 .globl ASM_PFX(AsmDisableCache)
 ASM_PFX(AsmDisableCache):
-    movl    %cr0, %rax
-    btsl    $30, %rax
-    btrl    $29, %rax
-    movl    %rax, %cr0
+    movq    %cr0, %rax
+    btsq    $30, %rax
+    btrq    $29, %rax
+    movq    %rax, %cr0
     wbinvd
     ret
diff --git a/MdePkg/Library/BaseLib/X64/EnableCache.S b/MdePkg/Library/BaseLib/X64/EnableCache.S
index 99257d6527..5c28b43857 100644
--- a/MdePkg/Library/BaseLib/X64/EnableCache.S
+++ b/MdePkg/Library/BaseLib/X64/EnableCache.S
@@ -32,8 +32,8 @@
 .globl ASM_PFX(AsmEnableCache)
 ASM_PFX(AsmEnableCache):
     wbinvd
-    movl    %cr0, %rax
-    btrl    $30, %rax
-    btrl    $29, %rax
-    movl    %rax, %cr0
+    movq    %cr0, %rax
+    btrq    $30, %rax
+    btrq    $29, %rax
+    movq    %rax, %cr0
     ret