Fix fallbacks when remote fetched data exists but is empty