Fixed when expired_at is nil