SPLIN-361 Fix app freeze issue on both android and iOS