PLA-1705 Fix only for external responses