diff --git a/edivorce/apps/core/templates/dashboard/final_filing.html b/edivorce/apps/core/templates/dashboard/final_filing.html
index 29f5fd1d..8df6ad51 100644
--- a/edivorce/apps/core/templates/dashboard/final_filing.html
+++ b/edivorce/apps/core/templates/dashboard/final_filing.html
@@ -244,9 +244,16 @@
                         You have indicated that you will file at the following court registry:
                     </p>
                     <ul class="no-bullets">
-                        <li>{{ court_registry_for_filing }}</li>
-                        <li>{{ court_registry_for_filing_address }}</li>
-                        <li>{{ court_registry_for_filing_postal_code }}</li>
+                        {% if court_registry_for_filing %}
+                            <li>{{ court_registry_for_filing }}</li>
+                            <li>{{ court_registry_for_filing_address }}</li>
+                            <li>{{ court_registry_for_filing_postal_code }}</li>
+                        {% else %}
+                            <p class="error-text">
+                                Go back to the questionnaire to choose a
+                                <a href="{% url 'question_steps' 'location' %}">filing location</a>.
+                            </p>
+                        {% endif %}
                     </ul>
                     <p>
                         Once sworn/affirmed and filed, you will receive a {% include "partials/tooltips/court_file_number.html" %}.
@@ -278,9 +285,16 @@
                         You have indicated that you will file at the following court registry:
                     </p>
                     <ul class="no-bullets">
-                        <li>{{ court_registry_for_filing }}</li>
-                        <li>{{ court_registry_for_filing_address }}</li>
-                        <li>{{ court_registry_for_filing_postal_code }}</li>
+                        {% if court_registry_for_filing %}
+                            <li>{{ court_registry_for_filing }}</li>
+                            <li>{{ court_registry_for_filing_address }}</li>
+                            <li>{{ court_registry_for_filing_postal_code }}</li>
+                        {% else %}
+                            <p class="error-text">
+                                Go back to the questionnaire to choose a
+                                <a href="{% url 'question_steps' 'location' %}">filing location</a>.
+                            </p>
+                        {% endif %}
                     </ul>
                 </div>
             {% endif %}
@@ -296,6 +310,12 @@
             In the next few steps you will be able to do a final review of your filed documentation,
             pay for your filing and (if completed successfully) receive a Package Number.
             This final step will complete your divorce filing.</p>
+        {% if not court_registry_for_filing %}
+            <div class="review-warning">
+                <span>In order to proceed with your application, you must select a
+                    <a href="{% url 'question_steps' 'location' %}">filing location</a>.</span>
+            </div>
+        {% endif %}
     {% endif %}
 
 {% endblock %}
@@ -308,7 +328,8 @@
     <div class="form-buttons clearfix">
         <a class="btn btn-primary" href="{% url 'dashboard_nav' 'swear_forms' %}"><i class="fa fa-arrow-circle-o-left"></i>&nbsp;&nbsp;&nbsp;Back</a>
         {% if how_to_file == 'Online' and final_filing_submitted != 'True' %}
-            <a class="btn btn-success pull-right" href="{% url 'submit_final_files' %}" id="submitDocuments">
+            <a class="btn btn-success pull-right" href="{% url 'submit_final_files' %}" id="submitDocuments"
+                {% if not court_registry_for_filing %}disabled{% endif %}>
                 <i class="fa fa-paper-plane"></i>&nbsp;&nbsp;&nbsp;
                 Submit Documents</a>
         {% else %}
diff --git a/edivorce/apps/core/templates/dashboard/initial_filing.html b/edivorce/apps/core/templates/dashboard/initial_filing.html
index 72bed9f9..ef2bbb6e 100644
--- a/edivorce/apps/core/templates/dashboard/initial_filing.html
+++ b/edivorce/apps/core/templates/dashboard/initial_filing.html
@@ -107,6 +107,12 @@
         <p>
             <b>You will need your Court File Number if you are filing any additional documentation.</b>
         </p>
+        {% if not court_registry_for_filing %}
+            <div class="review-warning">
+                <span>In order to proceed with your application, you must select a
+                    <a href="{% url 'question_steps' 'location' %}">filing location</a>.</span>
+            </div>
+        {% endif %}
     {% elif how_to_file == 'In-person' %}
         <p>
             You don't need to complete this step. Go to <a href="{% url 'dashboard_nav' 'swear_forms' %}">Swear Forms</a> for further instruction.
@@ -130,7 +136,8 @@
             <a class="btn btn-success pull-right" href="{% url 'dashboard_nav' 'wait_for_number' %}">Next&nbsp;&nbsp;&nbsp;<i
                     class="fa fa-arrow-circle-o-right"></i></a>
         {% elif how_to_file == 'Online' %}
-            <a class="btn btn-success pull-right" href="{% url 'submit_initial_files' %}" id="submitDocuments">
+            <a class="btn btn-success pull-right" href="{% url 'submit_initial_files' %}" id="submitDocuments"
+            {% if not court_registry_for_filing %}disabled{% endif %}>
                 <i class="fa fa-paper-plane"></i>&nbsp;&nbsp;&nbsp;
                 Submit Documents</a>
         {% else %}