Fix for TIM-572

To avoid MultipleObjectsReturned errors when assess peers
cherry-pick from d6cd4d552830a9c7d2c850bdbca7748a5d2b2c36