Fixes #6274 - only disable initial load if it's actually disabled.
Merge pull request #4301 from waldenraines/6274

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