Fix for server request with duplicate token issue