Fixed gift mode persistence on client