#5107 fix the unsubscribe prolem