Fix legacy subscription to handle no_echo