diff --git a/app/routes/_data.machines.$id.tsx b/app/routes/_data.machines.$id.tsx
index 484e233..96ff6f7 100644
--- a/app/routes/_data.machines.$id.tsx
+++ b/app/routes/_data.machines.$id.tsx
@@ -49,6 +49,7 @@ export default function Page() {
 	useLiveData({ interval: 1000 })
 
 	const expired = machine.expiry === '0001-01-01 00:00:00'
+		|| machine.expiry === '0001-01-01T00:00:00Z'
 		? false
 		: new Date(machine.expiry).getTime() < Date.now()
 
diff --git a/app/routes/_data.machines._index/machine.tsx b/app/routes/_data.machines._index/machine.tsx
index 05f95c1..27a3b36 100644
--- a/app/routes/_data.machines._index/machine.tsx
+++ b/app/routes/_data.machines._index/machine.tsx
@@ -17,6 +17,7 @@ interface Props {
 
 export default function MachineRow({ machine, routes, magic }: Props) {
 	const expired = machine.expiry === '0001-01-01 00:00:00'
+		|| machine.expiry === '0001-01-01T00:00:00Z'
 		? false
 		: new Date(machine.expiry).getTime() < Date.now()
 
diff --git a/app/routes/_data.machines._index/menu.tsx b/app/routes/_data.machines._index/menu.tsx
index eab60a4..4076781 100644
--- a/app/routes/_data.machines._index/menu.tsx
+++ b/app/routes/_data.machines._index/menu.tsx
@@ -23,6 +23,7 @@ export default function Menu({ machine, routes, magic }: MenuProps) {
 	const routesState = useState(false)
 
 	const expired = machine.expiry === '0001-01-01 00:00:00'
+		|| machine.expiry === '0001-01-01T00:00:00Z'
 		? false
 		: new Date(machine.expiry).getTime() < Date.now()