diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index f4c6eb5b21..d7a8a61cf7 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -237,8 +237,6 @@ from django.db.utils import ProgrammingError
 from waffle.models import Flag
 try:
     flag, created = Flag.objects.get_or_create(name='unified_course_view')
-    flag.everyone = True
-    flag.save
     WAFFLE_OVERRIDE = True
 except ProgrammingError:
     # during initial reset_db, the table for the flag doesn't yet exist.
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 783dc9afc9..5af70ac113 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -261,6 +261,18 @@ JWT_AUTH.update({
     'JWT_AUDIENCE': 'lms-key',
 })
 
+# TODO: TNL-6546: Remove this waffle and flag code.
+from django.db.utils import ProgrammingError
+from waffle.models import Flag
+try:
+    flag, created = Flag.objects.get_or_create(name='unified_course_view')
+    flag.everyone = True
+    flag.save()
+    WAFFLE_OVERRIDE = True
+except ProgrammingError:
+    # during initial reset_db, the table for the flag doesn't yet exist.
+    pass
+
 #####################################################################
 # See if the developer has any local overrides.
 if os.path.isfile(join(dirname(abspath(__file__)), 'private.py')):