Vasyl Kaigorodov here is something we can do quickly:

https://github.com/matzew/aerogear-unifiedpush-server/commit/207219b89471ecb079137b2c6c06411d310480d6