Fixes #6274 - only disable initial load if it's actually disabled.