diff --git a/openedx/core/djangoapps/theming/management/commands/compile_sass.py b/openedx/core/djangoapps/theming/management/commands/compile_sass.py
index eecbe684b528..fbfdd2f222a4 100644
--- a/openedx/core/djangoapps/theming/management/commands/compile_sass.py
+++ b/openedx/core/djangoapps/theming/management/commands/compile_sass.py
@@ -73,8 +73,8 @@ def handle(self, *args, **options):
             {"lms": "lms", "cms": "cms", "studio": "cms"}[sys]
             for sys in options.get("system", ["lms", "cms"])
         )
-        theme_dirs = options.get("theme_dirs", settings.COMPREHENSIVE_THEME_DIRS) or []
-        themes_option = options.get("themes", [])  # '[]' means 'all'
+        theme_dirs = options.get("theme_dirs") or settings.COMPREHENSIVE_THEME_DIRS or []
+        themes_option = options.get("themes") or []  # '[]' means 'all'
         if not settings.ENABLE_COMPREHENSIVE_THEMING:
             compile_themes = False
             themes = []