Both versions are OK

It doesn't matter. Both are welcome. The 2nd one is more fomal (with that)

Both are perfectly acceptable. There are some instances where it sounds much more natural to drop the "that," and some where it's much more natural to keep the "that," but it is completely optional in many cases.