diff --git a/drivers/input/touchscreen/nt36xxx/nt36xxx.c b/drivers/input/touchscreen/nt36xxx/nt36xxx.c
index a13bec188942..f272d6a868cc 100644
--- a/drivers/input/touchscreen/nt36xxx/nt36xxx.c
+++ b/drivers/input/touchscreen/nt36xxx/nt36xxx.c
@@ -3086,10 +3086,6 @@ static int32_t nvt_ts_suspend(struct device *dev)
 	}
 
 #ifdef CONFIG_NOVATEK_TRUSTED_TOUCH
-	if (atomic_read(&ts->trusted_touch_underway))
-		wait_for_completion_interruptible(
-			&ts->trusted_touch_powerdown);
-
 	atomic_set(&ts->suspend_resume_underway, 1);
 	reinit_completion(&ts->touch_suspend_resume);
 #endif
@@ -3124,7 +3120,10 @@ static int32_t nvt_ts_suspend(struct device *dev)
 	//---write command to enter "deep sleep mode"---
 	buf[0] = EVENT_MAP_HOST_CMD;
 	buf[1] = 0x11;
-	CTP_I2C_WRITE(ts->client, I2C_FW_Address, buf, 2);
+#ifdef CONFIG_NOVATEK_TRUSTED_TOUCH
+	if (!atomic_read(&ts->trusted_touch_underway))
+		CTP_I2C_WRITE(ts->client, I2C_FW_Address, buf, 2);
+#endif
 #endif // WAKEUP_GESTURE
 
 	mutex_unlock(&ts->lock);