Fix subscribe being broken if no existing subscriptions

Created by  jaremn  on July 19, 2020
Z2M2CAIM3QNI7ICW54Y2PLSADAG3FTQEPBRYWKXK6VBKMHSDC7MQC
Change contents