Fix rendering mode switching issue in old & new UI
remove if
Merge pull request #2881 from raven02/patch-3

Fix rendering mode switching issue in old & new UI