diff --git a/atst/routes/task_orders/index.py b/atst/routes/task_orders/index.py
index af8d3dab..34fa2754 100644
--- a/atst/routes/task_orders/index.py
+++ b/atst/routes/task_orders/index.py
@@ -15,7 +15,7 @@ def review_task_order(task_order_id):
     task_order = TaskOrders.get(task_order_id)
     if task_order.is_draft:
         return redirect(
-            url_for("task_orders.form_step_one_add_pdf", task_order_id=task_order.id)
+            url_for("task_orders.edit", task_order_id=task_order.id)
         )
     else:
         signature_form = SignatureForm()
diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py
index b38f4b18..8c5d4fd3 100644
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -60,7 +60,7 @@ def update_task_order(
 def edit(task_order_id):
     task_order = TaskOrders.get(task_order_id)
 
-    if task_order.number is None:
+    if not task_order.number:
         return redirect(
             url_for("task_orders.form_step_two_add_number", task_order_id=task_order_id)
         )
diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html
index 991c98b1..e3d0f199 100644
--- a/templates/portfolios/task_orders/index.html
+++ b/templates/portfolios/task_orders/index.html
@@ -13,7 +13,7 @@
 {% endmacro %}
 
 {% macro TaskOrderEditButton(task_order, text="Edit", secondary=False) %}
-  <a href="{{ url_for('task_orders.form_step_one_add_pdf', task_order_id=task_order.id) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
+  <a href="{{ url_for('task_orders.edit', task_order_id=task_order.id) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
     {{ text }}
   </a>
 {% endmacro %}
diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html
index c935411d..b162e572 100644
--- a/templates/portfolios/task_orders/review.html
+++ b/templates/portfolios/task_orders/review.html
@@ -5,7 +5,7 @@
 {% block portfolio_content %}
 
   {% call StickyCTA(text="Task order details") %}
-      <a href="{{ url_for('task_orders.form_step_one_add_pdf', task_order_id=task_order.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
+      <a href="{{ url_for('task_orders.edit', task_order_id=task_order.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
   {% endcall %}
 
   {% include "fragments/task_order_review.html" %}
diff --git a/tests/routes/task_orders/test_new.py b/tests/routes/task_orders/test_new.py
index 0c3041e8..0dfa0b23 100644
--- a/tests/routes/task_orders/test_new.py
+++ b/tests/routes/task_orders/test_new.py
@@ -307,7 +307,7 @@ def test_task_orders_submit_task_order(client, user_session, task_order):
 @pytest.mark.parametrize(
     "to_factory_args,expected_step",
     [
-        ({"number": None, "clins": []}, "step_2"),
+        ({"number": "", "clins": []}, "step_2"),
         ({"number": "1234567890123", "clins": []}, "step_3"),
         ({"number": "1234567890123", "create_clins": [1]}, "step_4"),
     ],