diff --git a/server/routers/resource/updateResource.ts b/server/routers/resource/updateResource.ts
index bfe6b2cf..04a57ec1 100644
--- a/server/routers/resource/updateResource.ts
+++ b/server/routers/resource/updateResource.ts
@@ -242,7 +242,12 @@ async function updateHttpResource(
         const [existingResource] = await db
             .select()
             .from(resources)
-            .where(eq(resources.niceId, updateData.niceId));
+            .where(
+            and(
+                eq(resources.niceId, updateData.niceId),
+                eq(resources.orgId, resource.orgId)
+            )
+        );
 
         if (
             existingResource &&
@@ -387,7 +392,12 @@ async function updateRawResource(
         const [existingResource] = await db
             .select()
             .from(resources)
-            .where(eq(resources.niceId, updateData.niceId));
+            .where(
+            and(
+                eq(resources.niceId, updateData.niceId),
+                eq(resources.orgId, resource.orgId)
+            )
+        );
 
         if (
             existingResource &&
diff --git a/server/routers/site/updateSite.ts b/server/routers/site/updateSite.ts
index de0c3f9c..2041420c 100644
--- a/server/routers/site/updateSite.ts
+++ b/server/routers/site/updateSite.ts
@@ -2,7 +2,7 @@ import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
 import { sites } from "@server/db";
-import { eq } from "drizzle-orm";
+import { eq, and } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -95,7 +95,12 @@ export async function updateSite(
             const existingSite = await db
                 .select()
                 .from(sites)
-                .where(eq(sites.niceId, updateData.niceId))
+                .where(
+                    and(
+                        eq(sites.niceId, updateData.niceId),
+                        eq(sites.orgId, sites.orgId)
+                    )
+                )
                 .limit(1);
 
             if (existingSite.length > 0 && existingSite[0].siteId !== siteId) {