diff --git a/pkg/coredata/control.go b/pkg/coredata/control.go
index f24a02aac..3e371de3c 100644
--- a/pkg/coredata/control.go
+++ b/pkg/coredata/control.go
@@ -790,6 +790,10 @@ WHERE
 
 	*c = controls
 
+	if len(controls) != len(gid.NewSet(controlIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/cookie_banner.go b/pkg/coredata/cookie_banner.go
index 537e66e89..ce7bdbef5 100644
--- a/pkg/coredata/cookie_banner.go
+++ b/pkg/coredata/cookie_banner.go
@@ -314,6 +314,10 @@ WHERE
 
 	*b = banners
 
+	if len(banners) != len(gid.NewSet(bannerIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/cookie_category.go b/pkg/coredata/cookie_category.go
index 182ad7821..4bc14a0ad 100644
--- a/pkg/coredata/cookie_category.go
+++ b/pkg/coredata/cookie_category.go
@@ -296,6 +296,10 @@ WHERE
 
 	*c = categories
 
+	if len(categories) != len(gid.NewSet(categoryIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/document.go b/pkg/coredata/document.go
index f06888281..bac12480a 100644
--- a/pkg/coredata/document.go
+++ b/pkg/coredata/document.go
@@ -277,6 +277,10 @@ WHERE
 
 	*p = documents
 
+	if len(documents) != len(gid.NewSet(documentIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/document_version.go b/pkg/coredata/document_version.go
index 6247c24bc..a32a13d91 100644
--- a/pkg/coredata/document_version.go
+++ b/pkg/coredata/document_version.go
@@ -201,6 +201,10 @@ WHERE
 
 	*dv = documentVersions
 
+	if len(documentVersions) != len(gid.NewSet(documentVersionIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/document_version_approval_quorum.go b/pkg/coredata/document_version_approval_quorum.go
index 1bc3dd230..3b2e93c15 100644
--- a/pkg/coredata/document_version_approval_quorum.go
+++ b/pkg/coredata/document_version_approval_quorum.go
@@ -173,6 +173,10 @@ WHERE
 
 	*q = quorums
 
+	if len(quorums) != len(gid.NewSet(quorumIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/file.go b/pkg/coredata/file.go
index df4f6e557..ace832a43 100644
--- a/pkg/coredata/file.go
+++ b/pkg/coredata/file.go
@@ -185,6 +185,10 @@ WHERE
 
 	*f = files
 
+	if len(files) != len(gid.NewSet(fileIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/framework.go b/pkg/coredata/framework.go
index 1e1ebcc6d..07c2d68cc 100644
--- a/pkg/coredata/framework.go
+++ b/pkg/coredata/framework.go
@@ -133,22 +133,6 @@ WHERE
 	return count, nil
 }
 
-func uniqueGIDs(values []gid.GID) []gid.GID {
-	set := make(map[gid.GID]struct{}, len(values))
-	unique := make([]gid.GID, 0, len(values))
-
-	for _, value := range values {
-		if _, ok := set[value]; ok {
-			continue
-		}
-
-		set[value] = struct{}{}
-		unique = append(unique, value)
-	}
-
-	return unique
-}
-
 func (f *Frameworks) LoadByOrganizationID(
 	ctx context.Context,
 	conn pg.Querier,
@@ -334,6 +318,10 @@ WHERE
 
 	*f = frameworks
 
+	if len(frameworks) != len(gid.NewSet(frameworkIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/measure.go b/pkg/coredata/measure.go
index ecc1ce772..32bf2ac97 100644
--- a/pkg/coredata/measure.go
+++ b/pkg/coredata/measure.go
@@ -527,6 +527,10 @@ WHERE
 
 	*m = measures
 
+	if len(measures) != len(gid.NewSet(measureIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/membership_profile.go b/pkg/coredata/membership_profile.go
index d1c090268..a713d89e8 100644
--- a/pkg/coredata/membership_profile.go
+++ b/pkg/coredata/membership_profile.go
@@ -449,6 +449,10 @@ WHERE
 
 	*p = profiles
 
+	if len(profiles) != len(gid.NewSet(profileIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/organization.go b/pkg/coredata/organization.go
index ca98594ef..f0b8b96e2 100644
--- a/pkg/coredata/organization.go
+++ b/pkg/coredata/organization.go
@@ -194,6 +194,10 @@ WHERE
 
 	*o = organizations
 
+	if len(organizations) != len(gid.NewSet(organizationIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/processing_activities.go b/pkg/coredata/processing_activities.go
index ff234c200..fe0966e92 100644
--- a/pkg/coredata/processing_activities.go
+++ b/pkg/coredata/processing_activities.go
@@ -373,6 +373,10 @@ WHERE
 
 	*p = processingActivities
 
+	if len(processingActivities) != len(gid.NewSet(processingActivityIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/risk.go b/pkg/coredata/risk.go
index 24a64679d..cb0cd634c 100644
--- a/pkg/coredata/risk.go
+++ b/pkg/coredata/risk.go
@@ -564,6 +564,10 @@ WHERE %s
 
 	*r = risks
 
+	if len(risks) != len(gid.NewSet(riskIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/task.go b/pkg/coredata/task.go
index f005fee23..29be0f976 100644
--- a/pkg/coredata/task.go
+++ b/pkg/coredata/task.go
@@ -205,6 +205,10 @@ WHERE
 
 	*t = tasks
 
+	if len(tasks) != len(gid.NewSet(taskIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/third_party.go b/pkg/coredata/third_party.go
index 91f794d8f..e4c924932 100644
--- a/pkg/coredata/third_party.go
+++ b/pkg/coredata/third_party.go
@@ -599,6 +599,10 @@ WHERE
 
 	*v = thirdParties
 
+	if len(thirdParties) != len(gid.NewSet(thirdPartyIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }
 
diff --git a/pkg/coredata/trust_center_file.go b/pkg/coredata/trust_center_file.go
index 48a537d50..fea86095d 100644
--- a/pkg/coredata/trust_center_file.go
+++ b/pkg/coredata/trust_center_file.go
@@ -178,6 +178,10 @@ WHERE
 
 	*f = files
 
+	if len(files) != len(gid.NewSet(trustCenterFileIDs...)) {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }