Highlight on server was still spamming in one instance, for #12058

Change-Id: Ic704c86913ed0ddd30c15b1de0debfc0f7ee8bf7