diff --git a/cms/djangoapps/api/v1/serializers/course_runs.py b/cms/djangoapps/api/v1/serializers/course_runs.py
index 775a1aa709..e37cd33a89 100644
--- a/cms/djangoapps/api/v1/serializers/course_runs.py
+++ b/cms/djangoapps/api/v1/serializers/course_runs.py
@@ -159,9 +159,9 @@ class CourseRunCreateSerializer(CourseRunSerializer):  # lint-amnesty, pylint: d
 
         with transaction.atomic():
             instance = create_new_course(user, _id['org'], _id['course'], _id['run'], validated_data)
-            update_unit_discussion_state_from_discussion_blocks(instance.id, user.id)
             self.update_team(instance, team)
-            return instance
+        update_unit_discussion_state_from_discussion_blocks(instance.id, user.id)
+        return instance
 
 
 class CourseRunRerunSerializer(CourseRunSerializerCommonFieldsMixin, CourseRunTeamSerializerMixin,  # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring