Fix double-echo with channel chat