diff --git a/platform/wab/src/wab/server/util/cms-util.spec.ts b/platform/wab/src/wab/server/util/cms-util.spec.ts
index d08bea5976e..4780ef9c71b 100644
--- a/platform/wab/src/wab/server/util/cms-util.spec.ts
+++ b/platform/wab/src/wab/server/util/cms-util.spec.ts
@@ -227,6 +227,40 @@ describe("makeSqlCondition", () => {
     });
   });
 
+  it("special cases _createdAt field", () => {
+    expect(
+      makeSqlCondition(
+        TEST_TABLE,
+        {
+          _createdAt: "2025-01-01T00:00:00Z",
+        },
+        { useDraft: false }
+      )
+    ).toEqual({
+      condition: `r.createdAt = :val0`,
+      params: {
+        val0: "2025-01-01T00:00:00Z",
+      },
+    });
+  });
+
+  it("special cases _updatedAt field", () => {
+    expect(
+      makeSqlCondition(
+        TEST_TABLE,
+        {
+          _updatedAt: "2025-01-01T00:00:00Z",
+        },
+        { useDraft: false }
+      )
+    ).toEqual({
+      condition: `r.updatedAt = :val0`,
+      params: {
+        val0: "2025-01-01T00:00:00Z",
+      },
+    });
+  });
+
   it("accesses nested nested field", () => {
     expect(
       makeSqlCondition(
diff --git a/platform/wab/src/wab/server/util/cms-util.ts b/platform/wab/src/wab/server/util/cms-util.ts
index c07e527d7a4..0481a6f22f1 100644
--- a/platform/wab/src/wab/server/util/cms-util.ts
+++ b/platform/wab/src/wab/server/util/cms-util.ts
@@ -199,8 +199,9 @@ export const makeTypedFieldSql = (
   opts: { useDraft?: boolean }
 ) => {
   const dataRef = makeDataRef(opts);
-  if (field === "_id") {
-    return "r.id";
+
+  if (field === "_id" || field === "_createdAt" || field === "_updatedAt") {
+    return `r.${field.replace("_", "")}`;
   }
 
   // Simple field access