diff --git a/lms/envs/common.py b/lms/envs/common.py
index ef4e52fecd..1f7597ab54 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -119,9 +119,6 @@ FEATURES = {
     # Enables ability to restrict enrollment in specific courses by the user account login method
     'RESTRICT_ENROLL_BY_REG_METHOD': False,
 
-    # analytics experiments
-    'ENABLE_INSTRUCTOR_ANALYTICS': False,
-
     # Enables the LMS bulk email feature for course staff
     'ENABLE_INSTRUCTOR_EMAIL': True,
     # If True and ENABLE_INSTRUCTOR_EMAIL: Forces email to be explicitly turned on
@@ -130,11 +127,14 @@ FEATURES = {
     #   for all Mongo-backed courses.
     'REQUIRE_COURSE_EMAIL_AUTH': True,
 
+    # Analytics experiments - shows instructor analytics tab in LMS instructor dashboard.
+    # Enabling this feature depends on installation of a separate analytics server.
+    'ENABLE_INSTRUCTOR_ANALYTICS': False,
+
     # enable analytics server.
     # WARNING: THIS SHOULD ALWAYS BE SET TO FALSE UNDER NORMAL
     # LMS OPERATION. See analytics.py for details about what
     # this does.
-
     'RUN_AS_ANALYTICS_SERVER_ENABLED': False,
 
     # Flip to True when the YouTube iframe API breaks (again)
diff --git a/lms/templates/instructor/instructor_dashboard_2/analytics.html b/lms/templates/instructor/instructor_dashboard_2/analytics.html
index 3b6eaaa959..b06b2c7501 100644
--- a/lms/templates/instructor/instructor_dashboard_2/analytics.html
+++ b/lms/templates/instructor/instructor_dashboard_2/analytics.html
@@ -15,30 +15,32 @@
   </div>
 </script>
 
-<script type="text/template" id="grade-distributions-widget-template">
-  <div class="grade-distributions-widget">
-    <div class="header">
-      <h2 class="title"> ${_("Score Distribution")} </h2>
-      <p>${_("The chart below displays the score distribution for each standard problem in your class, specified by the problem's url name.")}
-	${_("Scores are shown without weighting applied, so if your problem contains 2 questions, it will display as having a total of 2 points.")}</p>
-      <br />
-      ${_("Problem")}: <select class="problem-selector">
-        <option> ${_("Loading problem list...")} </option>
-      </select>
-      <div class="last-updated"></div>
+%if settings.FEATURES['ENABLE_INSTRUCTOR_ANALYTICS']:
+  <script type="text/template" id="grade-distributions-widget-template">
+    <div class="grade-distributions-widget">
+      <div class="header">
+	<h2 class="title"> ${_("Score Distribution")} </h2>
+	<p>${_("The chart below displays the score distribution for each standard problem in your class, specified by the problem's url name.")}
+	  ${_("Scores are shown without weighting applied, so if your problem contains 2 questions, it will display as having a total of 2 points.")}</p>
+	<br />
+	${_("Problem")}: <select class="problem-selector">
+          <option> ${_("Loading problem list...")} </option>
+	</select>
+	<div class="last-updated"></div>
+      </div>
+      <div class="view">
+	<div class="display-errors"></div>
+	<div class="display-text"></div>
+	<div class="display-graph"></div>
+      </div>
     </div>
-    <div class="view">
-      <div class="display-errors"></div>
-      <div class="display-text"></div>
-      <div class="display-graph"></div>
-    </div>
-  </div>
-</script>
+  </script>
 
-<div class="grade-distributions-widget-container"
-  data-endpoint="${ section_data['proxy_legacy_analytics_url'] }"
->
-</div>
+  <div class="grade-distributions-widget-container"
+       data-endpoint="${ section_data['proxy_legacy_analytics_url'] }"
+       >
+  </div>
+%endif
 
 <div class="profile-distribution-widget-container"
   data-title="${_("Year of Birth")}"