diff --git a/src/resources/extensions/sf/sf-db.js b/src/resources/extensions/sf/sf-db.js
index ce31d4248..d5e79ebde 100644
--- a/src/resources/extensions/sf/sf-db.js
+++ b/src/resources/extensions/sf/sf-db.js
@@ -7335,8 +7335,8 @@ export function getLatestValidationState(milestoneId, sliceId, taskId) {
 		.prepare(
 			`SELECT * FROM validation_runs
 			 WHERE milestone_id = :milestone_id
-			   AND (slice_id = :slice_id OR (slice_id IS NULL AND :slice_id IS NULL))
-			   AND (task_id = :task_id OR (task_id IS NULL AND :task_id IS NULL))
+			   AND slice_id IS :slice_id
+			   AND task_id IS :task_id
 			 ORDER BY created_at DESC, run_id DESC
 			 LIMIT 1`,
 		)
@@ -7360,8 +7360,8 @@ export function getValidationHistory(milestoneId, sliceId, taskId, limit = 20) {
 		.prepare(
 			`SELECT * FROM validation_runs
 			 WHERE milestone_id = :milestone_id
-			   AND (slice_id = :slice_id OR (slice_id IS NULL AND :slice_id IS NULL))
-			   AND (task_id = :task_id OR (task_id IS NULL AND :task_id IS NULL))
+			   AND slice_id IS :slice_id
+			   AND task_id IS :task_id
 			 ORDER BY created_at DESC, run_id DESC
 			 LIMIT :limit`,
 		)