diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index 8aedf583de..7f0d7ff3cc 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -53,6 +53,9 @@ def render_date(context, date_object):
     which differs from the python formatting!
     """
 
+    if date_object is None:
+        return None
+
     if type(date_object) == str:
         # If a string is passed, first convert it to a datetime
         date_object = date.fromisoformat(date_object)