TS-3125: Fix issue where a default context wont be created