BACKLOG-5028: Fix subscription service