Dell XPS 9310 2-in-1 Not recognising its own monitor, keyboard and mouse after docking

I am having issues with my XPS 9310 2-in-1 after it has been docked to Dell D6000 USB-C dock.

When initially docked the device works fine, the laptops own monitor, keyboard, mouse and all sensors inc. fingerprint and IR camera work fine.

If left to sleep when the device resumes it no longer recognises its own hardware, but docked monitors, mouse and keyboard still work. I can only operate the device when docked.

To resolve I need to do a hard reboot of the device by holding the power button. This can take a couple of attempts to resolve the issue. One resolved I can use as a laptop normally, but once docked and left to sleep the issue returns.

All drivers and BIOS have been updated via Support Assist.

Any suggestions welcome, not sure if it is a driver issue or a hardware issue with the hinge.