diff --git a/edivorce/apps/core/templates/overview.html b/edivorce/apps/core/templates/overview.html
index 32febfb8..65d2b4c8 100644
--- a/edivorce/apps/core/templates/overview.html
+++ b/edivorce/apps/core/templates/overview.html
@@ -94,7 +94,7 @@
 </div>
 
 
-{% if not request.session.FIRST_LOGIN and request.COOKIES.VIEWED_DASHBOARD_DURING_THIS_SESSION != 'True' %}
+{% if not request.session.FIRST_LOGIN and not request.session.VIEWED_DASHBOARD_DURING_SESSION %}
 <div id="questions_modal" class="modal fade" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -114,9 +114,6 @@
         </div>
     </div>
 </div>
-<script type="text/javascript">
-    document.cookie = 'VIEWED_DASHBOARD_DURING_THIS_SESSION=True';
-</script>
 {% endif %}
 
 {% endblock %}
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index af67da77..02738a3e 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -136,7 +136,6 @@ def logout(request):
     if settings.DEPLOYMENT_TYPE == 'localdev':
         response = redirect('/')
 
-    response.delete_cookie('VIEWED_DASHBOARD_DURING_THIS_SESSION')
     return response
 
 
@@ -150,9 +149,14 @@ def overview(request):
 
     # Add step status dictionary
     responses_dict_by_step['step_status'] = get_step_status(responses_dict_by_step)
-
     responses_dict_by_step['active_page'] = 'overview'
-    return render(request, 'overview.html', context=responses_dict_by_step)
+
+    response = render(request, 'overview.html', context=responses_dict_by_step)
+
+    # set this session variable after the page is already rendered
+    request.session['VIEWED_DASHBOARD_DURING_SESSION'] = True
+
+    return response
 
 
 @bceid_required