diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index c6ad6ab9f4..c08ac54b61 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -761,8 +761,8 @@ SetWorker (
 
   PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);
 
-  StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :
-                          mPcdDatabase->DxeDb.Init.StringTable;
+  StringTable = (UINT16*) (IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :
+                                     mPcdDatabase->DxeDb.Init.StringTable);
   
   InternalData = PcdDb + Offset;
 
@@ -789,8 +789,8 @@ SetWorker (
         }
       }
       
-      GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :
-                              mPcdDatabase->DxeDb.Init.GuidTable;
+      GuidTable   = (EFI_GUID *)(IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :
+                                           mPcdDatabase->DxeDb.Init.GuidTable);
                               
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);