Base: Fix issue loading app after deleting current site