diff --git a/lms/djangoapps/grades/events.py b/lms/djangoapps/grades/events.py
index 85044f4dc3..90279a3e69 100644
--- a/lms/djangoapps/grades/events.py
+++ b/lms/djangoapps/grades/events.py
@@ -246,9 +246,9 @@ def fire_segment_event_on_course_grade_passed_first_time(user_id, course_locator
         'COURSE_TITLE': courserun_display_name,
         'COURSE_ORG_NAME': courserun_org,
     }
-    segment.track(user_id, event_name, event_properties)
+    if getattr(settings, 'OUTCOME_SURVEYS_EVENTS_ENABLED', False):
+        segment.track(user_id, event_name, event_properties)
 
-    if getattr(settings, 'OUTCOME_SURVEYS_FOLLOW_UP_SIGNAL_ENABLED', False):
         # fire signal so that a follow up event can be scheduled in outcome_surveys app
         SCHEDULE_FOLLOW_UP_SEGMENT_EVENT_FOR_COURSE_PASSED_FIRST_TIME.send(
             sender=None,
diff --git a/lms/djangoapps/grades/tests/test_signals.py b/lms/djangoapps/grades/tests/test_signals.py
index 636241de54..72a20d4064 100644
--- a/lms/djangoapps/grades/tests/test_signals.py
+++ b/lms/djangoapps/grades/tests/test_signals.py
@@ -389,7 +389,7 @@ class CourseEventsSignalsTest(ModuleStoreTestCase):
             }
         )
 
-    @override_settings(OUTCOME_SURVEYS_FOLLOW_UP_SIGNAL_ENABLED=True)
+    @override_settings(OUTCOME_SURVEYS_EVENTS_ENABLED=True)
     @patch('lms.djangoapps.grades.events.segment.track')
     @patch('lms.djangoapps.grades.signals.signals.SCHEDULE_FOLLOW_UP_SEGMENT_EVENT_FOR_COURSE_PASSED_FIRST_TIME.send')
     def test_segment_event_on_course_grade_passed_first_time(self, signal_mock, segment_track_mock):
diff --git a/lms/envs/common.py b/lms/envs/common.py
index f3e8789ec6..59da19a35d 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -5191,4 +5191,4 @@ MFE_CONFIG = {}
 MFE_CONFIG_API_CACHE_TIMEOUT = 60 * 5
 
 ######################## Settings for Outcome Surveys plugin ########################
-OUTCOME_SURVEYS_FOLLOW_UP_SIGNAL_ENABLED = False
+OUTCOME_SURVEYS_EVENTS_ENABLED = False