Room/Venue contact - way to pinpoint address without making a company contact

Apologies if I have misinterpreted how to setup something, but we've found an issue that when we create a room, and assign the venue contact, when we send out booking confirmations, the address listed is the venue contacts personal address.

We have a workaround for some where we have created a contact in the name of the company, but feel it would be easier if it just got the address from the organisation page, or if we could just enter address directly on the room setup page.