I also got an annual merit scholarship form X University, that covers 30% of the tuition fees.

Is the use of "that" correct in the above? I think we have to use "which" for a non-defining adjective clause. Could you please help me to clarify this?