diff --git a/src/equipment/service.py b/src/equipment/service.py
index 86d880d..f7bd855 100644
--- a/src/equipment/service.py
+++ b/src/equipment/service.py
@@ -147,7 +147,11 @@ JOINED_MAXIMO_SQL = text(
         a.asset_unit = '3'
         AND a.wonum NOT LIKE 'T%'
         AND a.asset_assetnum = :assetnum
-        AND (EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600.0) <= 730
+        AND (
+            a.actfinish IS NULL
+            OR a.actstart IS NULL
+            OR (EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600.0) <= 730
+        )
         AND (
             (a.worktype = 'CM' AND a.wojp8 != 'S1')
             OR (a.worktype <> 'CM')