Fix cleaning up event unsubscription maintenance

Jan David Mol requested to merge L2SS-1258-fix-unsubscription into master

Closes L2SS-1258

Merge request reports