There's nothing you need to do before going to the witch queen. It can be helpful to get the map-room as soon as you can, but the natural order of things would be to wait on that.