Merge pull request #3540 from bjjay/bjjay-patch-1

Reduce once server protocol check