Add check for remoting before setting new entity listener