Nikon Z6 viewing issue

I was wondering if anyone had come across an issue on the Nikon Z range of cameras (I have the Z6) where the automatic switching between EVF and LCD monitor stops working.
I have the auto switching ON and when I switch on the camera I can see the scene via the monitor, then when I put my eye to the viewfinder it automatically switches to that but when I remove my eye from it it does NOT switch back to the monitor.
This is happening for Live View, Playback and Menu - which renders the menu touchscreen useless.
I upgraded the firmware to 2.0 on Thursday but I the issue predates this. I only have the camer less than 5 months and have been onto the shop where I purchased it and am waiting on a response.
Anyone else come across this ?
I have the auto switching ON and when I switch on the camera I can see the scene via the monitor, then when I put my eye to the viewfinder it automatically switches to that but when I remove my eye from it it does NOT switch back to the monitor.
This is happening for Live View, Playback and Menu - which renders the menu touchscreen useless.
I upgraded the firmware to 2.0 on Thursday but I the issue predates this. I only have the camer less than 5 months and have been onto the shop where I purchased it and am waiting on a response.
Anyone else come across this ?