diff --git a/drivers/arm/gic/v3/gicv3_helpers.c b/drivers/arm/gic/v3/gicv3_helpers.c
index c12a4b6..bd513a0 100644
--- a/drivers/arm/gic/v3/gicv3_helpers.c
+++ b/drivers/arm/gic/v3/gicv3_helpers.c
@@ -12,6 +12,7 @@
 #include <interrupt_props.h>
 #include "../common/gic_common_private.h"
 #include "gicv3_private.h"
+#include "arm_gicv3_common.h"
 
 /*
  * Accessor to read the GIC Distributor IGRPMODR corresponding to the
@@ -282,6 +283,19 @@
 	 */
 	assert((gicr_read_waker(gicr_base) & WAKER_CA_BIT) != 0U);
 
+	/*
+	 * ProcessorSleep bit can ONLY be set to zero when
+	 * Quiescent bit and Sleep bit are both zero, so
+	 * need to make sure Quiescent bit and Sleep bit
+	 * are zero before clearing ProcessorSleep bit.
+	 */
+	if (gicr_read_waker(gicr_base) & WAKER_QSC_BIT) {
+		gicr_write_waker(gicr_base, gicr_read_waker(gicr_base) & ~WAKER_SL_BIT);
+		/* Wait till the WAKER_QSC_BIT changes to 0 */
+		while ((gicr_read_waker(gicr_base) & WAKER_QSC_BIT) != 0U)
+			;
+	}
+
 	/* Mark the connected core as awake */
 	gicr_write_waker(gicr_base, gicr_read_waker(gicr_base) & ~WAKER_PS_BIT);