diff --git a/alembic/versions/3bd8552f1c57_add_unique_constraint_to_task_order_.py b/alembic/versions/3bd8552f1c57_add_unique_constraint_to_task_order_.py
index 24a0fcfa..8128a40a 100644
--- a/alembic/versions/3bd8552f1c57_add_unique_constraint_to_task_order_.py
+++ b/alembic/versions/3bd8552f1c57_add_unique_constraint_to_task_order_.py
@@ -6,8 +6,6 @@ Create Date: 2019-12-10 12:45:17.535973
 
 """
 from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = '3bd8552f1c57' # pragma: allowlist secret
diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py
index 41ebeb81..a5e02e8b 100644
--- a/atst/forms/task_order.py
+++ b/atst/forms/task_order.py
@@ -13,7 +13,7 @@ from numbers import Number
 
 from .data import JEDI_CLIN_TYPES
 from .fields import SelectField
-from .forms import BaseForm
+from .forms import BaseForm, remove_empty_string
 from atst.utils.localization import translate
 from flask import current_app as app
 
@@ -134,7 +134,10 @@ class AttachmentForm(BaseForm):
 
 
 class TaskOrderForm(BaseForm):
-    number = StringField(label=translate("forms.task_order.number_description"))
+    number = StringField(
+        label=translate("forms.task_order.number_description"),
+        filters=[remove_empty_string],
+    )
     pdf = FormField(
         AttachmentForm,
         label=translate("task_orders.form.supporting_docs_size_limit"),
@@ -142,14 +145,6 @@ class TaskOrderForm(BaseForm):
     )
     clins = FieldList(FormField(CLINForm))
 
-    @property
-    def data(self):
-        _data = super().data
-        if _data["number"] == "":
-            _data["number"] = None
-
-        return _data
-
 
 class SignatureForm(BaseForm):
     signature = BooleanField(
diff --git a/templates/task_orders/index.html b/templates/task_orders/index.html
index b9277123..160fb483 100644
--- a/templates/task_orders/index.html
+++ b/templates/task_orders/index.html
@@ -19,7 +19,7 @@
       {% if task_orders|length > 0 %}
         {% for task_order in task_orders %}
           {% set to_number %}
-            {% if task_order.number != "" %}
+            {% if task_order.number != None %}
               Task Order #{{ task_order.number }}
             {% else %}
               New Task Order