diff --git a/lms/envs/devstack_appsembler.py b/lms/envs/devstack_appsembler.py
index 1be1fcfc1e74..7ba9aa2d3fec 100644
--- a/lms/envs/devstack_appsembler.py
+++ b/lms/envs/devstack_appsembler.py
@@ -121,6 +121,5 @@
 except ImportError:
     pass
 
-
 # override devstack.py automatic enabling of courseware discovery
-FEATURES['ENABLE_COURSE_DISCOVERY'] = ENV_TOKENS.get('TPA_CLEAN_USERNAMES_KEEP_DOMAIN_PART', False)
+FEATURES['ENABLE_COURSE_DISCOVERY'] = ENV_TOKENS['FEATURES'].get('ENABLE_COURSE_DISCOVERY', FEATURES['ENABLE_COURSE_DISCOVERY'])