diff --git a/terraform/SLI_3_days_views.tf b/terraform/SLI_3_days_views.tf
index e6d06c4..2b5d3e0 100644
--- a/terraform/SLI_3_days_views.tf
+++ b/terraform/SLI_3_days_views.tf
@@ -71,7 +71,7 @@ resource "google_bigquery_table" "SLI_3_days_view" {
             census.datasetId=last_backups.source_dataset_id AND
             census.tableId=last_backups.source_table_id
           WHERE
-            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            (last_backups.source_partition_id IS NULL OR last_backups.source_partition_id=census.partitionId)
             AND projectId != "${var.bbq_project}"
             AND partitionId != "__UNPARTITIONED__"
             AND IFNULL(last_backups.backup_created, MSEC_TO_TIMESTAMP(0)) < TIMESTAMP(DATE_ADD(CURRENT_TIMESTAMP(), -3 , "DAY"))
diff --git a/terraform/SLI_4_days_views.tf b/terraform/SLI_4_days_views.tf
index 9edcf7c..9748993 100644
--- a/terraform/SLI_4_days_views.tf
+++ b/terraform/SLI_4_days_views.tf
@@ -71,7 +71,7 @@ resource "google_bigquery_table" "SLI_4_days_view" {
             census.datasetId=last_backups.source_dataset_id AND
             census.tableId=last_backups.source_table_id
           WHERE
-            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            (last_backups.source_partition_id IS NULL OR last_backups.source_partition_id=census.partitionId)
             AND projectId != "${var.bbq_project}"
             AND partitionId != "__UNPARTITIONED__"
             AND IFNULL(last_backups.backup_created, MSEC_TO_TIMESTAMP(0)) < TIMESTAMP(DATE_ADD(CURRENT_TIMESTAMP(), -4 , "DAY"))
diff --git a/terraform/SLI_5_days_views.tf b/terraform/SLI_5_days_views.tf
index ea99ac4..055ac8d 100644
--- a/terraform/SLI_5_days_views.tf
+++ b/terraform/SLI_5_days_views.tf
@@ -71,7 +71,7 @@ resource "google_bigquery_table" "SLI_5_days_view" {
             census.datasetId=last_backups.source_dataset_id AND
             census.tableId=last_backups.source_table_id
           WHERE
-            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            (last_backups.source_partition_id IS NULL OR last_backups.source_partition_id=census.partitionId)
             AND projectId != "${var.bbq_project}"
             AND partitionId != "__UNPARTITIONED__"
             AND IFNULL(last_backups.backup_created, MSEC_TO_TIMESTAMP(0)) < TIMESTAMP(DATE_ADD(CURRENT_TIMESTAMP(), -5 , "DAY"))
diff --git a/terraform/SLI_7_days_views.tf b/terraform/SLI_7_days_views.tf
index 863a941..ebb1101 100644
--- a/terraform/SLI_7_days_views.tf
+++ b/terraform/SLI_7_days_views.tf
@@ -71,7 +71,7 @@ resource "google_bigquery_table" "SLI_7_days_view" {
               census.datasetId=last_backups.source_dataset_id AND
               census.tableId=last_backups.source_table_id
             WHERE
-              IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+              (last_backups.source_partition_id IS NULL OR last_backups.source_partition_id=census.partitionId)
               AND projectId != "${var.bbq_project}"
               AND partitionId != "__UNPARTITIONED__"
               AND IFNULL(last_backups.backup_created, MSEC_TO_TIMESTAMP(0)) < TIMESTAMP(DATE_ADD(CURRENT_TIMESTAMP(), -7 , "DAY"))