Fix Elara App Shutdown issue