Fix repeated EED messages leading to "Unknown token" messages