[BACKLOG-1109] Fix for when attributes are removed