Implement hack to avoid UI throwing this error

Bug: 58394
Change-Id: I5e5e39d443889ec586bff16f1604d238633a901e