diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 1420aa5432..3514b56989 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -531,7 +531,10 @@ def dashboard(request):
     for course, __ in course_enrollment_pairs:
         enrolled_courses_dict[unicode(course.id)] = course
 
-    credit_messages = _create_credit_availability_message(enrolled_courses_dict, user)
+    if settings.FEATURES.get("ENABLE_CREDIT_ELIGIBILITY"):
+        credit_messages = _create_credit_availability_message(enrolled_courses_dict, user)
+    else:
+        credit_messages = {}
 
     course_optouts = Optout.objects.filter(user=user).values_list('course_id', flat=True)
 
diff --git a/openedx/core/djangoapps/credit/tests/test_api.py b/openedx/core/djangoapps/credit/tests/test_api.py
index 14b5b7acba..1defe94291 100644
--- a/openedx/core/djangoapps/credit/tests/test_api.py
+++ b/openedx/core/djangoapps/credit/tests/test_api.py
@@ -5,6 +5,8 @@ import unittest
 import datetime
 import ddt
 import pytz
+from mock import patch
+
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.db import connection, transaction
@@ -697,6 +699,7 @@ class CreditMessagesTests(ModuleStoreTestCase, CreditApiTestBase):
         request_status = api.get_credit_request_status(self.student.username, self.course.id)
         self.assertEqual(len(request_status), 0)
 
+    @patch.dict(settings.FEATURES, {"ENABLE_CREDIT_ELIGIBILITY": True})
     def test_credit_messages(self):
         self._set_creditcourse()