diff --git a/src/arch/riscv/payload.c b/src/arch/riscv/payload.c
index 3097ad1bf8..ee2ee8e45c 100644
--- a/src/arch/riscv/payload.c
+++ b/src/arch/riscv/payload.c
@@ -39,13 +39,6 @@ void run_payload(struct prog *prog, void *fdt, int payload_mode)
 	status = INSERT_FIELD(status, MSTATUS_MPIE, 0);
 
 	switch (payload_mode) {
-	case RISCV_PAYLOAD_MODE_U:
-		status = INSERT_FIELD(status, MSTATUS_MPP, PRV_U);
-		/* Trap vector base address point to the payload */
-		write_csr(utvec, doit);
-		/* disable U-Mode interrupt */
-		write_csr(uie, 0);
-		break;
 	case RISCV_PAYLOAD_MODE_S:
 		status = INSERT_FIELD(status, MSTATUS_MPP, PRV_S);
 		/* Trap vector base address point to the payload */