Added fallback to default site id even in non-debug mode