diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index eba8750a41..11396d1537 100755
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -199,10 +199,12 @@ CEntryPoint (
   if (!IS_XIP()) {
     if (IS_PRIMARY_CORE(MpId)) {
       mGlobalVariableBase = GlobalVariableBase;
-      ArmCpuSynchronizeSignal (ARM_CPU_EVENT_DEFAULT);
+      if (ArmIsMpCore()) {
+        ArmCpuSynchronizeSignal (ARM_CPU_EVENT_DEFAULT);
+      }
     } else {
-	  // Wait the Primay core has defined the address of the Global Variable region
-	  ArmCpuSynchronizeWait (ARM_CPU_EVENT_DEFAULT);
+      // Wait the Primay core has defined the address of the Global Variable region
+      ArmCpuSynchronizeWait (ARM_CPU_EVENT_DEFAULT);
     }
   }