diff --git a/client/src/components/jobs-notes/jobs.notes.component.jsx b/client/src/components/jobs-notes/jobs.notes.component.jsx
index 9ef671f56..d307be7e8 100644
--- a/client/src/components/jobs-notes/jobs.notes.component.jsx
+++ b/client/src/components/jobs-notes/jobs.notes.component.jsx
@@ -9,7 +9,6 @@ import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import useLocalStorage from "../../utils/useLocalStorage";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import NoteUpsertModal from "../note-upsert-modal/note-upsert-modal.container";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 import JobNotesPinToggle from "../job-notes-pin-toggle/job-notes-pin-toggle.component";
 
@@ -184,8 +183,6 @@ export function JobNotesComponent({
           </Button>
         }
       >
-        <NoteUpsertModal />
-
         <Table loading={loading} columns={columns} rowKey="id" dataSource={data} onChange={handleTableChange} />
       </Card>
     </div>
diff --git a/client/src/components/parts-shop-info/parts-shop-info.container.jsx b/client/src/components/parts-shop-info/parts-shop-info.container.jsx
index 27a7e3dd8..a7828a75c 100644
--- a/client/src/components/parts-shop-info/parts-shop-info.container.jsx
+++ b/client/src/components/parts-shop-info/parts-shop-info.container.jsx
@@ -27,7 +27,7 @@ export default function PartsShopInfoContainer() {
     logImEXEvent("parts_shop_update");
 
     updateBodyshop({
-      variables: { id: data.bodyshops[0].id, shop: values }
+      variables: { id: data?.bodyshops?.[0]?.id, shop: values }
     })
       .then(() => {
         notification.success({ title: t("bodyshop.successes.save") });
@@ -38,6 +38,7 @@ export default function PartsShopInfoContainer() {
           title: t("bodyshop.errors.saving", { message: error })
         });
       });
+
     setSaveLoading(false);
   };
 
@@ -55,7 +56,7 @@ export default function PartsShopInfoContainer() {
       autoComplete="new-password"
       onFinish={handleFinish}
       initialValues={
-        data
+        data?.bodyshops?.[0]
           ? {
               ...data.bodyshops[0],
               schedule_start_time: dayjs(data.bodyshops[0].schedule_start_time),
diff --git a/client/src/components/production-board-kanban/production-board-kanban.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
index 37aa45138..19a3b13bd 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -6,7 +6,6 @@ import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { generate_UPDATE_JOB_KANBAN } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -208,7 +207,6 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
         }
       />
 
-      <NoteUpsertModal />
       <ProductionListDetailComponent jobs={data} />
 
       <Board
diff --git a/client/src/graphql/notes.queries.js b/client/src/graphql/notes.queries.js
index 77858ae44..ceebcc3e7 100644
--- a/client/src/graphql/notes.queries.js
+++ b/client/src/graphql/notes.queries.js
@@ -26,6 +26,7 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
       id
       ro_number
       vehicle {
+        id
         jobs {
           id
           ro_number
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index e236f364e..0d84b7401 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -43,7 +43,6 @@ import JobsDocumentsGalleryContainer from "../../components/jobs-documents-galle
 import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
 import LockWrapperComponent from "../../components/lock-wrapper/lock-wrapper.component.jsx";
-import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
 import TaskListContainer from "../../components/task-list/task-list.container.jsx";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
@@ -311,7 +310,6 @@ export function JobsDetailPage({
       <ScheduleJobModalContainer />
       <JobReconciliationModal />
       <JobLineUpsertModalContainer />
-      <NoteUpsertModalComponent />
       <Form
         form={form}
         name="JobDetailForm"
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 5cb0844f7..e5d1d5241 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -34,6 +34,8 @@ const PrintCenterModalContainer = lazy(
   () => import("../../components/print-center-modal/print-center-modal.container")
 );
 
+const NoteUpsertModal = lazy(() => import("../../components/note-upsert-modal/note-upsert-modal.container.jsx"));
+
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 
 const CardPaymentModalContainer = lazy(
@@ -181,6 +183,7 @@ export function Manage({ conflict, bodyshop, partsManagementOnly, isDarkMode, cu
       <TimeTicketModalContainer />
       <TimeTicketModalTask />
       <PrintCenterModalContainer />
+      <NoteUpsertModal />
       <Routes>
         <Route path="/_test" element={<TestComponent />} />
         <Route path="/" element={<ManageRootPage />} />
diff --git a/client/src/pages/production-list/production-list.component.jsx b/client/src/pages/production-list/production-list.component.jsx
index 7efc2c8e4..24a47dbb2 100644
--- a/client/src/pages/production-list/production-list.component.jsx
+++ b/client/src/pages/production-list/production-list.component.jsx
@@ -1,4 +1,3 @@
-import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ProductionListTable from "../../components/production-list-table/production-list-table.container";
 
 import { connect } from "react-redux";
@@ -25,7 +24,6 @@ export function ProductionListComponent({ bodyshop }) {
 
   return (
     <>
-      <NoteUpsertModal />
       <ProductionListTable bodyshop={bodyshop} subscriptionType={Production_Use_View.treatment} />
     </>
   );