diff --git a/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c b/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
index ac0642750c..02b286b16a 100644
--- a/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
+++ b/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
@@ -351,6 +351,7 @@ Interrupt8259SetMode (
     //
     // Write new legacy mode mask/trigger level
     //
+    Interrupt8259SetVectorBase (This, LEGACY_MODE_BASE_VECTOR_MASTER, LEGACY_MODE_BASE_VECTOR_SLAVE);
     Interrupt8259WriteMask (mLegacyModeMask, mLegacyModeEdgeLevel);
 
     return EFI_SUCCESS;
@@ -386,6 +387,7 @@ Interrupt8259SetMode (
     //
     // Write new protected mode mask/trigger level
     //
+    Interrupt8259SetVectorBase (This, PROTECTED_MODE_BASE_VECTOR_MASTER, PROTECTED_MODE_BASE_VECTOR_SLAVE);
     Interrupt8259WriteMask (mProtectedModeMask, mProtectedModeEdgeLevel);
 
     return EFI_SUCCESS;