diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c
index a353e8db..c7e882e3 100644
--- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c
+++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c
@@ -538,10 +538,6 @@ END:
 void XFsbl_HandoffExit(u64 HandoffAddress, u32 Flags)
 {
 
-#ifdef XFSBL_WDT_PRESENT
-	/* Stop WDT as we are exiting FSBL */
-	XFsbl_StopWdt();
-#endif
 
 	/**
 	 * Flush the L1 data cache and L2 cache, Disable Data Cache
@@ -952,6 +948,11 @@ u32 XFsbl_Handoff (XFsblPs * FsblInstancePtr, u32 PartitionNum, u32 EarlyHandoff
 	 */
 	XFsbl_Out32(XFSBL_ERROR_STATUS_REGISTER_OFFSET, XFSBL_COMPLETED);
 
+#ifdef XFSBL_WDT_PRESENT
+	/* Stop WDT as we are exiting FSBL */
+	XFsbl_StopWdt();
+#endif
+
 	/**
 	 * call to the handoff routine
 	 * which will never return
diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c
index cac6070c..91a7b3ee 100644
--- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c
+++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c
@@ -457,11 +457,6 @@ static u32 XFsbl_PrimaryBootDeviceInit(XFsblPs * FsblInstancePtr)
 		{
 			XFsbl_Printf(DEBUG_GENERAL,"In JTAG Boot Mode \n\r");
 			Status = XFSBL_STATUS_JTAG;
-
-#ifdef XFSBL_WDT_PRESENT
-			/* Stop WDT as we are in JTAG boot mode */
-			XFsbl_StopWdt();
-#endif
 		}
 		break;