diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_config.h b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_config.h
index 9e20dda1..6b049b83 100644
--- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_config.h
+++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_config.h
@@ -132,7 +132,7 @@ extern "C" {
 #define FSBL_AES_EXCLUDE_VAL			(0U)
 #define FSBL_BS_EXCLUDE_VAL				(0U)
 #define FSBL_SHA2_EXCLUDE_VAL			(1U)
-#define FSBL_EARLY_HANDOFF_EXCLUDE_VAL	(0U)
+#define FSBL_EARLY_HANDOFF_EXCLUDE_VAL	(1U)
 #define FSBL_WDT_EXCLUDE_VAL			(0U)
 
 #if FSBL_NAND_EXCLUDE_VAL
diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c
index 747a1e77..76c62b12 100644
--- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c
+++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c
@@ -1102,14 +1102,14 @@ END:
 u32 XFsbl_CheckEarlyHandoffCpu(u32 CpuId)
 {
 	u32 CpuNeedEarlyHandoff = FALSE;
-
+#if defined(XFSBL_EARLY_HANDOFF)
 	if ((CpuId == XIH_PH_ATTRB_DEST_CPU_R5_0) ||
 			(CpuId == XIH_PH_ATTRB_DEST_CPU_R5_1) ||
 			(CpuId == XIH_PH_ATTRB_DEST_CPU_R5_L))
 	{
 		CpuNeedEarlyHandoff = TRUE;
 	}
-
+#endif
 	return CpuNeedEarlyHandoff;
 
 }