diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c
index 01e8f7de9655..c900253c5133 100644
--- a/drivers/power/reset/msm-poweroff.c
+++ b/drivers/power/reset/msm-poweroff.c
@@ -402,6 +402,9 @@ static void msm_restart_prepare(const char *cmd)
 	 * Kill download mode if master-kill switch is set
 	 */
 
+	if (cmd != NULL && !strcmp(cmd, "qcom_dload"))
+		restart_mode = RESTART_DLOAD;
+
 	set_dload_mode(download_mode &&
 			(in_panic || restart_mode == RESTART_DLOAD));