diff --git a/plat/imx/imx8ulp/apd_context.c b/plat/imx/imx8ulp/apd_context.c
index b484a66..54b8795 100644
--- a/plat/imx/imx8ulp/apd_context.c
+++ b/plat/imx/imx8ulp/apd_context.c
@@ -558,12 +558,13 @@
 
 	iomuxc_restore();
 
-	gpio_restore(apd_gpio_ctx, APD_GPIO_CTRL_NUM);
-
 	tpm5_restore();
 
 	xrdc_reinit();
 
+	/* Restore GPIO after xrdc_reinit, otherwise MSCs are invalid */
+	gpio_restore(apd_gpio_ctx, APD_GPIO_CTRL_NUM);
+
 	/* restore the gic config */
 	plat_gic_restore(proc_num, &imx_gicv3_ctx);