diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
index 9314a455e..ae3accf53 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -75,7 +75,7 @@ export function JobsAvailableContainer({
   const client = useApolloClient();
 
   const estDataLazyLoad = useLazyQuery(QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK);
-  const [loadEstData, estData] = estDataLazyLoad;
+  const [loadEstData, estDataRaw] = estDataLazyLoad;
 
   const importOptionsState = useState({ overrideHeaders: false });
   const importOptions = importOptionsState[0];
@@ -88,11 +88,13 @@ export function JobsAvailableContainer({
     setOwnerModalVisible(false);
     setInsertLoading(true);
 
+    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
+
     if (
       !(
-        estData.data &&
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
+  
+        estData &&
+        estData.est_data
       )
     ) {
       //We don't have the right data. Error!
@@ -106,28 +108,28 @@ export function JobsAvailableContainer({
     const newTotals = (
       await Axios.post("/job/totals", {
         job: {
-          ...estData.data.available_jobs_by_pk.est_data,
-          joblines: estData.data.available_jobs_by_pk.est_data.joblines.data,
+          ...estData.est_data,
+          joblines: estData.est_data.joblines.data,
         },
       })
     ).data;
 
     let existingVehicles;
     if (
-      estData.data.available_jobs_by_pk.est_data.vehicle &&
-      estData.data.available_jobs_by_pk.est_data.vin
+      estData.est_data.vehicle &&
+      estData.est_data.vin
     ) {
       //There's vehicle data, need to double check the VIN.
       existingVehicles = await client.query({
         query: SEARCH_VEHICLE_BY_VIN,
         variables: {
-          vin: estData.data.available_jobs_by_pk.est_data.vehicle.data.v_vin,
+          vin: estData.est_data.vehicle.data.v_vin,
         },
       });
     }
 
     const newJob = {
-      ...estData.data.available_jobs_by_pk.est_data,
+      ...estData.est_data,
       clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
       owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
       job_totals: newTotals,
@@ -172,7 +174,7 @@ export function JobsAvailableContainer({
         });
 
         deleteJob({
-          variables: { id: estData.data.available_jobs_by_pk.id },
+          variables: { id: estData.id },
         }).then((r) => {
           refetch();
           setInsertLoading(false);
@@ -194,12 +196,12 @@ export function JobsAvailableContainer({
 
     setJobModalVisible(false);
     setInsertLoading(true);
-
+    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
     if (
       !(
-        estData.data &&
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
+        
+        estData &&
+        estData.est_data
       )
     ) {
       //We don't have the right data. Error!
@@ -209,7 +211,7 @@ export function JobsAvailableContainer({
       });
     } else {
       //create upsert job
-      let supp = _.cloneDeep(estData.data.available_jobs_by_pk.est_data);
+      let supp = _.cloneDeep(estData.est_data);
 
       delete supp.owner;
       delete supp.vehicle;
@@ -220,7 +222,7 @@ export function JobsAvailableContainer({
       let suppDelta = await GetSupplementDelta(
         client,
         selectedJob,
-        estData.data.available_jobs_by_pk.est_data.joblines.data
+        estData.est_data.joblines.data
       );
 
       delete supp.joblines;
@@ -279,7 +281,7 @@ export function JobsAvailableContainer({
       //Job has been inserted. Clean up the available jobs record.
 
       deleteJob({
-        variables: { id: estData.data.available_jobs_by_pk.id },
+        variables: { id: estData.id },
       }).then((r) => {
         refetch();
         setInsertLoading(false);
@@ -305,13 +307,13 @@ export function JobsAvailableContainer({
   };
 
   const owner =
-    estData.data &&
-    estData.data.available_jobs_by_pk &&
-    estData.data.available_jobs_by_pk.est_data &&
-    estData.data.available_jobs_by_pk.est_data.owner &&
-    estData.data.available_jobs_by_pk.est_data.owner.data &&
-    !estData.data.available_jobs_by_pk.issupplement
-      ? estData.data.available_jobs_by_pk.est_data.owner.data
+    estDataRaw.data &&
+    estDataRaw.data.available_jobs_by_pk &&
+    estDataRaw.data.available_jobs_by_pk.est_data &&
+    estDataRaw.data.available_jobs_by_pk.est_data.owner &&
+    estDataRaw.data.available_jobs_by_pk.est_data.owner.data &&
+    !estDataRaw.data.available_jobs_by_pk.issupplement
+      ? estDataRaw.data.available_jobs_by_pk.est_data.owner.data
       : null;
 
   const onOwnerModalCancel = () => {
@@ -349,8 +351,8 @@ export function JobsAvailableContainer({
       message={t("jobs.labels.creating_new_job")}
     >
       <OwnerFindModalContainer
-        loading={estData.loading}
-        error={estData.error}
+        loading={estDataRaw.loading}
+        error={estDataRaw.error}
         owner={owner}
         selectedOwner={selectedOwner}
         setSelectedOwner={setSelectedOwner}
@@ -359,8 +361,8 @@ export function JobsAvailableContainer({
         onCancel={onOwnerModalCancel}
       />
       <JobsFindModalContainer
-        loading={estData.loading}
-        error={estData.error}
+        loading={estDataRaw.loading}
+        error={estDataRaw.error}
         selectedJob={selectedJob}
         setSelectedJob={setSelectedJob}
         importOptionsState={importOptionsState}
@@ -390,3 +392,12 @@ export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(JobsAvailableContainer);
+
+function replaceEmpty(someObj, replaceValue = null) {
+  const replacer = (key, value) => (value === "" ? replaceValue : value);
+  //^ because you seem to want to replace (strings) "null" or "undefined" too
+  console.log(someObj)
+  const temp = JSON.stringify(someObj, replacer);
+  console.log(`temp`, temp);
+  return JSON.parse(temp);
+}