diff --git a/app/modules/kit/service.server.ts b/app/modules/kit/service.server.ts
index db050e3e5..592be322a 100644
--- a/app/modules/kit/service.server.ts
+++ b/app/modules/kit/service.server.ts
@@ -124,10 +124,11 @@ export async function updateKit({
   imageExpiration,
   status,
   createdById,
+  organizationId,
 }: UpdateKitPayload) {
   try {
     return await db.kit.update({
-      where: { id },
+      where: { id, organizationId },
       data: {
         name,
         description,
@@ -147,10 +148,12 @@ export async function updateKitImage({
   request,
   kitId,
   userId,
+  organizationId,
 }: {
   request: Request;
   kitId: string;
   userId: string;
+  organizationId: Kit["organizationId"];
 }) {
   try {
     const fileData = await parseFileFormData({
@@ -176,6 +179,7 @@ export async function updateKitImage({
       image: signedUrl,
       imageExpiration: oneDayFromNow(),
       createdById: userId,
+      organizationId,
     });
   } catch (cause) {
     throw new ShelfError({
diff --git a/app/modules/kit/types.ts b/app/modules/kit/types.ts
index 99994b04b..e6eac486b 100644
--- a/app/modules/kit/types.ts
+++ b/app/modules/kit/types.ts
@@ -9,6 +9,7 @@ export type UpdateKitPayload = Partial<
     | "image"
     | "imageExpiration"
     | "createdById"
+    | "organizationId"
   >
 > & {
   id: Kit["id"];
diff --git a/app/routes/_layout+/kits.$kitId_.edit.tsx b/app/routes/_layout+/kits.$kitId_.edit.tsx
index fb983c209..8df1a9eba 100644
--- a/app/routes/_layout+/kits.$kitId_.edit.tsx
+++ b/app/routes/_layout+/kits.$kitId_.edit.tsx
@@ -113,11 +113,13 @@ export async function action({ context, request, params }: ActionFunctionArgs) {
         createdById: userId,
         name: payload.name,
         description: payload.description,
+        organizationId,
       }),
       updateKitImage({
         request,
         kitId,
         userId,
+        organizationId,
       }),
     ]);
 
diff --git a/app/routes/_layout+/kits.new.tsx b/app/routes/_layout+/kits.new.tsx
index 15dc75390..308588dfc 100644
--- a/app/routes/_layout+/kits.new.tsx
+++ b/app/routes/_layout+/kits.new.tsx
@@ -86,6 +86,7 @@ export async function action({ context, request }: LoaderFunctionArgs) {
       request,
       kitId: kit.id,
       userId,
+      organizationId,
     });
 
     sendNotification({