diff --git a/course/grading.py b/course/grading.py
index 5691309d0f4123abfffef7988bf730b1c1f82cdd..c7d42d76c4524814b8261fce91955f6c6c2ba54c 100644
--- a/course/grading.py
+++ b/course/grading.py
@@ -202,7 +202,9 @@ def grade_flow_page(pctx, flow_session_id, page_ordinal):
     grade_data = None
     shown_grade = None
 
-    if fpctx.page.expects_answer():
+    page_expects_answer = fpctx.page.expects_answer()
+
+    if page_expects_answer:
         if fpctx.prev_answer_visit is not None and prev_grade_id is None:
             answer_data = fpctx.prev_answer_visit.answer
 
@@ -263,7 +265,7 @@ def grade_flow_page(pctx, flow_session_id, page_ordinal):
 
     # {{{ grading form
 
-    if (fpctx.page.expects_answer()
+    if (page_expects_answer
             and fpctx.page.is_answer_gradable()
             and fpctx.prev_answer_visit is not None
             and not flow_session.in_progress
@@ -340,7 +342,7 @@ def grade_flow_page(pctx, flow_session_id, page_ordinal):
 
     max_points = None
     points_awarded = None
-    if (fpctx.page.expects_answer()
+    if (page_expects_answer
             and fpctx.page.is_answer_gradable()):
         max_points = fpctx.page.max_points(fpctx.page_data)
         if feedback is not None and feedback.correctness is not None:
@@ -379,6 +381,7 @@ def grade_flow_page(pctx, flow_session_id, page_ordinal):
                 "points_awarded": points_awarded,
                 "shown_grade": shown_grade,
                 "prev_grade_id": prev_grade_id,
+                "expects_answer": page_expects_answer,
 
                 "grading_opportunity": grading_opportunity,
 
diff --git a/course/templates/course/flow-page.html b/course/templates/course/flow-page.html
index 5b88808776d6ec4d424d0495a0a7028854ab169a..824de5f15483325774756af2a4e5f0e28344c768 100644
--- a/course/templates/course/flow-page.html
+++ b/course/templates/course/flow-page.html
@@ -155,23 +155,23 @@
       {# }}} #}
 
       {# {{{ past submissions #}
-
-      <div class="navbar-right relate-flow-page-past-submissions"
-        style="padding-right: 0.4em; margin-right:0;">
-        <div class="dropdown" id="past-submission_dropdown">
-          <button class="btn btn-default dropdown-toggle" type="button" id="past-submission_dropdown_button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"
-            title='{% trans "Submission history for this page" %}'>
-            <i class="fa fa-history"></i>
-            <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu" aria-labelledby="past-submission_dropdown_button" id="past-submission_dropdown_content">
-            <li style="list-style:none; position:relative; left:50%;">
-              <i class="fa fa-spinner fa-spin relate-icon-busy"></i>
-            </li>
-          </ul>
+      {% if expects_answer %}
+        <div class="navbar-right relate-flow-page-past-submissions"
+          style="padding-right: 0.4em; margin-right:0;">
+          <div class="dropdown" id="past-submission_dropdown">
+            <button class="btn btn-default dropdown-toggle" type="button" id="past-submission_dropdown_button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"
+              title='{% trans "Submission history for this page" %}'>
+              <i class="fa fa-history"></i>
+              <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu" aria-labelledby="past-submission_dropdown_button" id="past-submission_dropdown_content">
+              <li style="list-style:none; position:relative; left:50%;">
+                <i class="fa fa-spinner fa-spin relate-icon-busy"></i>
+              </li>
+            </ul>
+          </div>
         </div>
-      </div>
-
+      {% endif %}
       {# }}} #}
 
       {# {{{ 'finish' button #}
@@ -607,52 +607,54 @@
 
 {% block page_bottom_javascript_extra %}
 
-  <script src="{{ STATIC_URL }}blueimp-tmpl/js/tmpl.min.js"></script>
-  <script>
-    function generate_past_submission_dropdown_content(){
-      var jqxhr = $.ajax({
-        url: "{% url "relate-get_prev_answer_visits_dropdown_content" course.identifier flow_session.id ordinal %}"
-      }).done(function (result) {
-        if(result.result)
-          document.getElementById("past-submission_dropdown_content").innerHTML = tmpl("tmpl-prev-answer-visits", result.result);
-      });
-    }
+  {% if expects_answer %}
+    <script src="{{ STATIC_URL }}blueimp-tmpl/js/tmpl.min.js"></script>
+    <script>
+      function generate_past_submission_dropdown_content(){
+        var jqxhr = $.ajax({
+          url: "{% url "relate-get_prev_answer_visits_dropdown_content" course.identifier flow_session.id ordinal %}"
+        }).done(function (result) {
+          if(result.result)
+            document.getElementById("past-submission_dropdown_content").innerHTML = tmpl("tmpl-prev-answer-visits", result.result);
+        });
+      }
 
-    $('#past-submission_dropdown').on('shown.bs.dropdown', generate_past_submission_dropdown_content);
+      $('#past-submission_dropdown').on('shown.bs.dropdown', generate_past_submission_dropdown_content);
 
 
-  </script>
+    </script>
 
-  {# https://github.com/blueimp/JavaScript-Templates #}
-  <script type="text/x-tmpl" id="tmpl-prev-answer-visits">
-    {{ JQ_OPEN }} if (o.length==0) { {{ JQ_CLOSE }}
-      <li>
-        <a href="#" style="pointer-events: none; display: inline-block;">
-          {% trans 'No submission history' %}
-        </a>
-      </li>
-    {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
-      {{ JQ_OPEN }} for (var i=0; i<o.length; i++) { {{ JQ_CLOSE }}
+    {# https://github.com/blueimp/JavaScript-Templates #}
+    <script type="text/x-tmpl" id="tmpl-prev-answer-visits">
+      {{ JQ_OPEN }} if (o.length==0) { {{ JQ_CLOSE }}
         <li>
-          {{ JQ_OPEN }} if (i==0) { {{ JQ_CLOSE }}
-            <a href="?">
-          {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
-            <a href="?visit_id={{ JQ_OPEN }}=o[i].id{{ JQ_CLOSE }}">
-          {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-            {{ JQ_OPEN }} if (o[i].id=={{ prev_visit_id }}) { {{ JQ_CLOSE }}<b>{{ JQ_OPEN }} } {{ JQ_CLOSE }}
-              {{ JQ_OPEN }}=o[i].visit_time{{ JQ_CLOSE }}
-            {{ JQ_OPEN }} if (o[i].id=={{ prev_visit_id }}) { {{ JQ_CLOSE }}</b>{{ JQ_OPEN }} } {{ JQ_CLOSE }}
-            {{ JQ_OPEN }} if (i==0) { {{ JQ_CLOSE }}
-            {% trans "(current)" %}
-            {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-            {{ JQ_OPEN }} if (o[i].is_submitted_answer) { {{ JQ_CLOSE }}
-              {% trans "(submitted)" %}
-            {{ JQ_OPEN }} } {{ JQ_CLOSE }}
+          <a href="#" style="pointer-events: none; display: inline-block;">
+            {% trans 'No submission history' %}
           </a>
         </li>
+      {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
+        {{ JQ_OPEN }} for (var i=0; i<o.length; i++) { {{ JQ_CLOSE }}
+          <li>
+            {{ JQ_OPEN }} if (i==0) { {{ JQ_CLOSE }}
+              <a href="?">
+            {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
+              <a href="?visit_id={{ JQ_OPEN }}=o[i].id{{ JQ_CLOSE }}">
+            {{ JQ_OPEN }} } {{ JQ_CLOSE }}
+              {{ JQ_OPEN }} if (o[i].id=={{ prev_visit_id }}) { {{ JQ_CLOSE }}<b>{{ JQ_OPEN }} } {{ JQ_CLOSE }}
+                {{ JQ_OPEN }}=o[i].visit_time{{ JQ_CLOSE }}
+              {{ JQ_OPEN }} if (o[i].id=={{ prev_visit_id }}) { {{ JQ_CLOSE }}</b>{{ JQ_OPEN }} } {{ JQ_CLOSE }}
+              {{ JQ_OPEN }} if (i==0) { {{ JQ_CLOSE }}
+              {% trans "(current)" %}
+              {{ JQ_OPEN }} } {{ JQ_CLOSE }}
+              {{ JQ_OPEN }} if (o[i].is_submitted_answer) { {{ JQ_CLOSE }}
+                {% trans "(submitted)" %}
+              {{ JQ_OPEN }} } {{ JQ_CLOSE }}
+            </a>
+          </li>
+        {{ JQ_OPEN }} } {{ JQ_CLOSE }}
       {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-    {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-  </script>
+    </script>
+  {% endif %}
   {{ block.super }}
 {% endblock %}
 {# vim: set foldmethod=marker: #}
diff --git a/course/templates/course/grade-flow-page.html b/course/templates/course/grade-flow-page.html
index 9b1858aa3ecc437537c5df8fdfca7397756a2266..85edc63fe055d6e7ad93716151bffec55d2499d3 100644
--- a/course/templates/course/grade-flow-page.html
+++ b/course/templates/course/grade-flow-page.html
@@ -13,21 +13,22 @@
       {# {{{ student view #}
 
       {# {{{ past submissions #}
-
-      <div style="float: right; padding-top:1.5em; margin-right:0 !important;" class="navbar-right">
-        <div class="dropdown" id="past-submission-and-grades_dropdown">
-          <button class="btn btn-default dropdown-toggle" type="button" id="past-submission-and-grades_dropdown_button"
-                  data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-            {% trans "Past submissions/grades" %}
-            <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu" aria-labelledby="past-submission-and-grades_dropdown_button" id="past-submission-and-grades_dropdown_content">
-            <li style="list-style:none; position:relative; left:50%;">
-              <i class="fa fa-spinner fa-spin relate-icon-busy"></i>
-            </li>
-          </ul>
+      {% if expects_answer %}
+        <div style="float: right; padding-top:1.5em; margin-right:0 !important;" class="navbar-right">
+          <div class="dropdown" id="past-submission-and-grades_dropdown">
+            <button class="btn btn-default dropdown-toggle" type="button" id="past-submission-and-grades_dropdown_button"
+                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+              {% trans "Past submissions/grades" %}
+              <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu" aria-labelledby="past-submission-and-grades_dropdown_button" id="past-submission-and-grades_dropdown_content">
+              <li style="list-style:none; position:relative; left:50%;">
+                <i class="fa fa-spinner fa-spin relate-icon-busy"></i>
+              </li>
+            </ul>
+          </div>
         </div>
-      </div>
+      {% endif %}
 
       {# }}} #}
       {{ body|safe }}
@@ -405,55 +406,57 @@
 
 {% block page_bottom_javascript_extra %}
 
-  <script src="{{ STATIC_URL }}blueimp-tmpl/js/tmpl.min.js"></script>
-  <script>
-
-    function generate_past_submission_and_grades_dropdown_content(){
-      var jqxhr = $.ajax({
-        url: "{% url "relate-get_prev_grades_dropdown_content" course.identifier flow_session.id ordinal %}"
-      }).done(function (result) {
-        if(result.result)
-        document.getElementById("past-submission-and-grades_dropdown_content").innerHTML = tmpl("tmpl-prev-grades", result.result);
-      });
-    }
+  {% if expects_answer %}
+    <script src="{{ STATIC_URL }}blueimp-tmpl/js/tmpl.min.js"></script>
+    <script>
+
+      function generate_past_submission_and_grades_dropdown_content(){
+        var jqxhr = $.ajax({
+          url: "{% url "relate-get_prev_grades_dropdown_content" course.identifier flow_session.id ordinal %}"
+        }).done(function (result) {
+          if(result.result)
+          document.getElementById("past-submission-and-grades_dropdown_content").innerHTML = tmpl("tmpl-prev-grades", result.result);
+        });
+      }
 
-    $('#past-submission-and-grades_dropdown').on('shown.bs.dropdown', generate_past_submission_and_grades_dropdown_content);
+      $('#past-submission-and-grades_dropdown').on('shown.bs.dropdown', generate_past_submission_and_grades_dropdown_content);
 
-  </script>
+    </script>
 
-  {# https://github.com/blueimp/JavaScript-Templates #}
-  <script type="text/x-tmpl" id="tmpl-prev-grades">
-    {{ JQ_OPEN }} if (o.length==0) { {{ JQ_CLOSE }}
-      <li>
-        <a href="#" style="pointer-events: none; display: inline-block;">
-          {% trans 'No submission/grade history' %}
-        </a>
-      </li>
-    {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
-      {{ JQ_OPEN }} for (var i=0; i<o.length; i++) { {{ JQ_CLOSE }}
+    {# https://github.com/blueimp/JavaScript-Templates #}
+    <script type="text/x-tmpl" id="tmpl-prev-grades">
+      {{ JQ_OPEN }} if (o.length==0) { {{ JQ_CLOSE }}
         <li>
-          {{ JQ_OPEN }} if (i==0) { {{ JQ_CLOSE }}
-            <a href="?">
-          {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
-            <a href="?grade_id={{ JQ_OPEN }}=o[i].id{{ JQ_CLOSE }}">
-          {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-            {{ JQ_OPEN }} if (o[i].id=={{ prev_grade_id }}) { {{ JQ_CLOSE }}<b>{{ JQ_OPEN }} } {{ JQ_CLOSE }}
-            {% trans "Submission:" %} {{ JQ_OPEN }}=o[i].visit_time{{ JQ_CLOSE }} &middot; {% trans "Grade:" %} {{ JQ_OPEN }}=o[i].grade_time{{ JQ_CLOSE }}
-            {{ JQ_OPEN }} if (o[i].id=={{ prev_grade_id }}) { {{ JQ_CLOSE }}</b>{{ JQ_OPEN }} } {{ JQ_CLOSE }}
+          <a href="#" style="pointer-events: none; display: inline-block;">
+            {% trans 'No submission/grade history' %}
+          </a>
+        </li>
+      {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
+        {{ JQ_OPEN }} for (var i=0; i<o.length; i++) { {{ JQ_CLOSE }}
+          <li>
             {{ JQ_OPEN }} if (i==0) { {{ JQ_CLOSE }}
-            {% trans "(current)" %}
-            {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-            {{ JQ_OPEN }} if (!o[i].value) { {{ JQ_CLOSE }}
-              [{% trans "no grade" %}]
+              <a href="?">
             {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
-              [{{ JQ_OPEN }}=o[i].value{{ JQ_CLOSE }}
-              {{ JQ_OPEN }} if (o[i].value <=1) { {{ JQ_CLOSE }}{% trans "point" %}{{ JQ_OPEN }} } else { {{ JQ_CLOSE }}{% trans "points" %}{{ JQ_OPEN }} } {{ JQ_CLOSE }}]
+              <a href="?grade_id={{ JQ_OPEN }}=o[i].id{{ JQ_CLOSE }}">
             {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-          </a>
-        </li>
+              {{ JQ_OPEN }} if (o[i].id=={{ prev_grade_id }}) { {{ JQ_CLOSE }}<b>{{ JQ_OPEN }} } {{ JQ_CLOSE }}
+              {% trans "Submission:" %} {{ JQ_OPEN }}=o[i].visit_time{{ JQ_CLOSE }} &middot; {% trans "Grade:" %} {{ JQ_OPEN }}=o[i].grade_time{{ JQ_CLOSE }}
+              {{ JQ_OPEN }} if (o[i].id=={{ prev_grade_id }}) { {{ JQ_CLOSE }}</b>{{ JQ_OPEN }} } {{ JQ_CLOSE }}
+              {{ JQ_OPEN }} if (i==0) { {{ JQ_CLOSE }}
+              {% trans "(current)" %}
+              {{ JQ_OPEN }} } {{ JQ_CLOSE }}
+              {{ JQ_OPEN }} if (!o[i].value) { {{ JQ_CLOSE }}
+                [{% trans "no grade" %}]
+              {{ JQ_OPEN }} } else { {{ JQ_CLOSE }}
+                [{{ JQ_OPEN }}=o[i].value{{ JQ_CLOSE }}
+                {{ JQ_OPEN }} if (o[i].value <=1) { {{ JQ_CLOSE }}{% trans "point" %}{{ JQ_OPEN }} } else { {{ JQ_CLOSE }}{% trans "points" %}{{ JQ_OPEN }} } {{ JQ_CLOSE }}]
+              {{ JQ_OPEN }} } {{ JQ_CLOSE }}
+            </a>
+          </li>
+        {{ JQ_OPEN }} } {{ JQ_CLOSE }}
       {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-    {{ JQ_OPEN }} } {{ JQ_CLOSE }}
-  </script>
+    </script>
+  {% endif %}
   {{ block.super }}
 {% endblock %}