diff --git a/common/djangoapps/edxmako/management/commands/preprocess_assets.py b/common/djangoapps/edxmako/management/commands/preprocess_assets.py
index 6afcbe896e..dbcc3e94c2 100644
--- a/common/djangoapps/edxmako/management/commands/preprocess_assets.py
+++ b/common/djangoapps/edxmako/management/commands/preprocess_assets.py
@@ -53,7 +53,10 @@ class Command(NoArgsCommand):
         """
         # TODO: do we need to include anything else?
         # TODO: do this with the django-settings-context-processor
-        return { "THEME_NAME" : getattr(settings, "THEME_NAME", None) }
+        return {
+            "FEATURES": settings.FEATURES,
+            "THEME_NAME" : getattr(settings, "THEME_NAME", None),
+        }
 
 
     def __preprocess(self, infile, outfile):
diff --git a/lms/static/sass/application-extend1.scss.mako b/lms/static/sass/application-extend1.scss.mako
index dddbabf686..310abf9f2d 100644
--- a/lms/static/sass/application-extend1.scss.mako
+++ b/lms/static/sass/application-extend1.scss.mako
@@ -23,7 +23,7 @@
 ## called themes/<theme-name>/, with its base Sass file in
 ## themes/<theme-name>/static/sass/_<theme-name>.scss. That one entry
 ## point can be used to @import in as many other things as needed.
-% if env.get('THEME_NAME') is not None:
+% if env["FEATURES"].get("USE_CUSTOM_THEME", False):
   // import theme's Sass overrides
   @import '${env.get('THEME_NAME')}';
 % endif
diff --git a/lms/static/sass/application-extend2.scss.mako b/lms/static/sass/application-extend2.scss.mako
index 2bed660596..9473a41e4a 100644
--- a/lms/static/sass/application-extend2.scss.mako
+++ b/lms/static/sass/application-extend2.scss.mako
@@ -23,7 +23,7 @@
 ## called themes/<theme-name>/, with its base Sass file in
 ## themes/<theme-name>/static/sass/_<theme-name>.scss. That one entry
 ## point can be used to @import in as many other things as needed.
-% if env.get('THEME_NAME') is not None:
+% if env["FEATURES"].get("USE_CUSTOM_THEME", False):
   // import theme's Sass overrides
   @import '${env.get('THEME_NAME')}';
 % endif
diff --git a/lms/static/sass/application.scss.mako b/lms/static/sass/application.scss.mako
index 9c5fa312e5..7d6da444ce 100644
--- a/lms/static/sass/application.scss.mako
+++ b/lms/static/sass/application.scss.mako
@@ -22,7 +22,7 @@
 ## called themes/<theme-name>/, with its base Sass file in
 ## themes/<theme-name>/static/sass/_<theme-name>.scss. That one entry
 ## point can be used to @import in as many other things as needed.
-% if env.get('THEME_NAME') is not None:
+% if env["FEATURES"].get("USE_CUSTOM_THEME", False):
   // import theme's Sass overrides
   @import '${env.get('THEME_NAME')}';
 % endif
diff --git a/lms/static/sass/course.scss.mako b/lms/static/sass/course.scss.mako
index bef3afa9cd..4bd8cfe4bd 100644
--- a/lms/static/sass/course.scss.mako
+++ b/lms/static/sass/course.scss.mako
@@ -13,7 +13,7 @@
 ## called themes/<theme-name>/, with its base Sass file in
 ## themes/<theme-name>/static/sass/_<theme-name>.scss. That one entry
 ## point can be used to @import in as many other things as needed.
-% if env.get('THEME_NAME') is not None:
+% if env["FEATURES"].get("USE_CUSTOM_THEME", False):
   // import theme's Sass overrides
   @import '${env.get('THEME_NAME')}';
 % endif
diff --git a/rakelib/assets.rake b/rakelib/assets.rake
index bbd1f07493..f0a854b114 100644
--- a/rakelib/assets.rake
+++ b/rakelib/assets.rake
@@ -1,7 +1,7 @@
 # Theming constants
-THEME_NAME = ENV_TOKENS['THEME_NAME']
-USE_CUSTOM_THEME = !(THEME_NAME.nil? || THEME_NAME.empty?)
+USE_CUSTOM_THEME = ENV_TOKENS['USE_CUSTOM_THEME']
 if USE_CUSTOM_THEME
+    THEME_NAME = ENV_TOKENS['THEME_NAME']
     THEME_ROOT = File.join(ENV_ROOT, "themes", THEME_NAME)
     THEME_SASS = File.join(THEME_ROOT, "static", "sass")
 end