diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py
index 708ed89b..31f35f38 100644
--- a/atst/routes/workspaces.py
+++ b/atst/routes/workspaces.py
@@ -121,7 +121,7 @@ def workspace_reports(workspace_id):
         remaining_difference = expiration_date - today
         remaining_days = remaining_difference.days
     else:
-        remaining_days = 0
+        remaining_days = None
 
     return render_template(
         "workspaces/reports/index.html",
diff --git a/templates/workspaces/reports/index.html b/templates/workspaces/reports/index.html
index 34ae423a..7ba48018 100644
--- a/templates/workspaces/reports/index.html
+++ b/templates/workspaces/reports/index.html
@@ -65,16 +65,26 @@
               <div>
                 <dt>Expires</dt>
                 <dd>
-                  <local-datetime
-                    timestamp='{{ expiration_date }}'
-                    format='MMMM D, YYYY'>
-                    </local-datetime>
+                  {% if expiration_date %}
+                    <local-datetime
+                      timestamp='{{ expiration_date }}'
+                      format='MMMM D, YYYY'>
+                      </local-datetime>
+                  {% else %}
+                      -
+                  {% endif %}
                 </dd>
               </div>
 
               <div>
                 <dt>Remaining</dt>
-                <dd>{{ remaining_days }} days</dd>
+                <dd>
+                  {% if remaining_days is not none %}
+                    {{ remaining_days }} days
+                  {% else %}
+                    -
+                  {% endif %}
+                </dd>
               </div>
             </dl>