diff --git a/java/google/registry/beam/sql/billing_events.sql b/java/google/registry/beam/sql/billing_events.sql
index a0c403830..2757fbe5f 100644
--- a/java/google/registry/beam/sql/billing_events.sql
+++ b/java/google/registry/beam/sql/billing_events.sql
@@ -54,6 +54,7 @@ FROM (
     FROM
       `%PROJECT_ID%.%DATASTORE_EXPORT_DATA_SET%.%REGISTRY_TABLE%`
     WHERE
+    -- TODO(b/18092292): Add a filter for tldState (not PDT/PREDELEGATION)
       tldType = 'REAL') ) AS BillingEvent
   -- Gather billing ID from registrar table
   -- This is a 'JOIN' as opposed to 'LEFT JOIN' to filter out
diff --git a/javatests/google/registry/beam/testdata/billing_events_test.sql b/javatests/google/registry/beam/testdata/billing_events_test.sql
index da6330411..4a1b32783 100644
--- a/javatests/google/registry/beam/testdata/billing_events_test.sql
+++ b/javatests/google/registry/beam/testdata/billing_events_test.sql
@@ -54,6 +54,7 @@ FROM (
     FROM
       `my-project-id.latest_datastore_export.Registry`
     WHERE
+    -- TODO(b/18092292): Add a filter for tldState (not PDT/PREDELEGATION)
       tldType = 'REAL') ) AS BillingEvent
   -- Gather billing ID from registrar table
   -- This is a 'JOIN' as opposed to 'LEFT JOIN' to filter out