diff --git a/core/kernel/user_ta.c b/core/kernel/user_ta.c
index 1e2663378b6..cba8de3283e 100644
--- a/core/kernel/user_ta.c
+++ b/core/kernel/user_ta.c
@@ -223,11 +223,12 @@ static TEE_Result user_ta_enter(struct ts_session *session,
 	dec_recursion();
 out_clr_cancel:
 	/*
-	 * Clear the cancel state now that the user TA has returned. The next
+	 * Reset the cancel state now that the user TA has returned. The next
 	 * time the TA will be invoked will be with a new operation and should
 	 * not have an old cancellation pending.
 	 */
 	ta_sess->cancel = false;
+	ta_sess->cancel_mask = true;
 
 	return res;
 }