XPS 13 9310 Bitlocker prompt with USB-C dock

Greetings everyone, is there a solution to this somewhat odd issue?  I use my XPS 13 9310 at a primary office, where it is usually connected to a USB-C / Thunderbolt dock, and at a secondary office, where it is usually connected to another USB-C / Thunderbolt dock (an older model).

In the primary office, when turned on, off, standby, wake from hibernate, etc. the 9310 has no problems with being attached or not to the USB-C dock.

In the secondary office, however, I sometimes have to be sure that the laptop is turned on whilst NOT connected to the dock, or the Bitlocker prompt will come up.  Afterwards, however, if I wake the laptop from sleep whilst connected to the dock, no Bitlocker prompt comes up.  But if I disconnect the laptop from the dock and wake it up, the Bitlocker prompt comes up.

My conclusion is that the 9310 is doing some sort of check for hardware configuration and keeps detecting this particular dock as a major hardware change, whereas it doesn't in the case of my primary office dock.

Is there a way to turn off this detection of hardware change?  I came across this help page but it's not for the XPS 9310: https://www.dell.com/support/kbdoc/en-sg/000128275/bitlocker-asks-for-a-recovery-key-every-boot-on-usb-c-thunderbolt-systems-when-docked-or-undocked

Thanks.