diff --git a/src/Sql/dbo/Stored Procedures/Organization_EnableCollectionEnhancements.sql b/src/Sql/dbo/Stored Procedures/Organization_EnableCollectionEnhancements.sql
index f0e83f3150..1d031a1bd6 100644
--- a/src/Sql/dbo/Stored Procedures/Organization_EnableCollectionEnhancements.sql	
+++ b/src/Sql/dbo/Stored Procedures/Organization_EnableCollectionEnhancements.sql	
@@ -157,7 +157,7 @@ BEGIN
             CASE WHEN ou.[Type] = 3 THEN 1 ELSE 0 END AS [IsManager]
         INTO #TempStep3
         FROM [dbo].[OrganizationUser] ou
-        WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND
+        WHERE ou.[OrganizationId] = @OrganizationId AND (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND
             ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'));
 
         BEGIN TRY
diff --git a/util/Migrator/DbScripts/2024-01-11_00_Organization_EnableCollectionEnhancements.sql b/util/Migrator/DbScripts/2024-01-11_00_Organization_EnableCollectionEnhancements.sql
index 37d5d93dfc..ad08c79985 100644
--- a/util/Migrator/DbScripts/2024-01-11_00_Organization_EnableCollectionEnhancements.sql
+++ b/util/Migrator/DbScripts/2024-01-11_00_Organization_EnableCollectionEnhancements.sql
@@ -157,7 +157,7 @@ BEGIN
             CASE WHEN ou.[Type] = 3 THEN 1 ELSE 0 END AS [IsManager]
         INTO #TempStep3
         FROM [dbo].[OrganizationUser] ou
-        WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND
+        WHERE ou.[OrganizationId] = @OrganizationId AND (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND
             ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'));
 
         BEGIN TRY