SCATTER-262 prevent double update