diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mmMemRestore.c b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mmMemRestore.c
index ab1ce1a696..346489220e 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mmMemRestore.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mmMemRestore.c
@@ -408,7 +408,9 @@ MemMRestoreDqsTimings (
         if (!MemMSetCSRNb (&NBArray[Node], Reg->SpecialCases, PciAddress, *((UINT32 *) OrMask) & Reg->RegisterList[j].AndMask)) {
           return FALSE;   // Restore fails
         }
-        OrMask += (Reg->RegisterList[j].Type.RegisterSize == 0) ? 4 : Reg->RegisterList[j].Type.RegisterSize;
+        if (Reg->RegisterList[j].Type.RegisterSize != 3)
+          OrMask += (Reg->RegisterList[j].Type.RegisterSize == 0) ? 4 :
+            Reg->RegisterList[j].Type.RegisterSize;
       }
 
       if (MaxNode < Node) {
@@ -431,7 +433,9 @@ MemMRestoreDqsTimings (
           if (!MemMSetCSRNb (&NBArray[Node], CReg->SpecialCases, PciAddress, *((UINT32 *) OrMask) & CReg->RegisterList[j].AndMask)) {
             return FALSE;   // Restore fails
           }
-          OrMask += (CReg->RegisterList[j].Type.RegisterSize == 0) ? 4 : CReg->RegisterList[j].Type.RegisterSize;
+          if (CReg->RegisterList[j].Type.RegisterSize != 3)
+            OrMask += (CReg->RegisterList[j].Type.RegisterSize == 0) ? 4 :
+              CReg->RegisterList[j].Type.RegisterSize;
         }
       }
     } else if (((State == ST_PRE_ESR) && (Device.CommonDeviceHeader->Type == DEV_TYPE_MSR_PRE_ESR)) ||