FIX: Shuffle only when default state is not None