diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx
index 15672f0f1..dd2dcc500 100644
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -101,7 +101,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
- if (!jobId || !bodyshop.cdk_dealerid) return ;
+ if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
+ return ;
if (loading) return ;
if (error) return ;
@@ -110,7 +111,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
- {data && data.jobs_by_pk.ro_number}
+ {data && data.jobs_by_pk && data.jobs_by_pk.ro_number}