Bug - Condition / remove enter from ui / api