Vanchi/radar117 dont listen to closed socket

@samshull Same changes but relative to what's on production. (Production does not have memorize, api changes)