diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a82ac737da..4d8cb15c9e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,3 +6,4 @@
 - Log the reason for a Cloud Function if needed in Next.js (#5320)
 - Fixed service enablement when installing extensions with v2 functions (#5338)
 - Fix bug where functions:shell command didn't connect to emulators running on other processes. (#5269)
+- Fixed bug with Cross-Service Rules integration for Firestore documents containing nulls (#5342)
diff --git a/src/emulator/downloadableEmulators.ts b/src/emulator/downloadableEmulators.ts
index d307cc5567f..4bdf7d6bfdc 100644
--- a/src/emulator/downloadableEmulators.ts
+++ b/src/emulator/downloadableEmulators.ts
@@ -38,9 +38,9 @@ const EMULATOR_UPDATE_DETAILS: { [s in DownloadableEmulators]: EmulatorUpdateDet
     expectedChecksum: "4f41d24a3c0f3b55ea22804a424cc0ee",
   },
   storage: {
-    version: "1.1.1",
-    expectedSize: 46448285,
-    expectedChecksum: "691982db4019d49d345a97151bdea7e2",
+    version: "1.1.2",
+    expectedSize: 47028740,
+    expectedChecksum: "983b4415b1e72b109864f1b8e7ea7546",
   },
   ui: experiments.isEnabled("emulatoruisnapshot")
     ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
diff --git a/src/emulator/storage/rules/runtime.ts b/src/emulator/storage/rules/runtime.ts
index 1f53eb05bfd..127cddd8890 100644
--- a/src/emulator/storage/rules/runtime.ts
+++ b/src/emulator/storage/rules/runtime.ts
@@ -415,7 +415,7 @@ function toExpressionValue(obj: any): ExpressionValue {
 
   if (obj == null) {
     return {
-      null_value: 0,
+      null_value: null,
     };
   }
 
@@ -484,7 +484,7 @@ function createRequestExpressionValue(opts: RulesetVerificationOpts): Expression
     },
     time: toExpressionValue(new Date()),
     resource: toExpressionValue(opts.file.after ? opts.file.after : null),
-    auth: opts.token ? createAuthExpressionValue(opts) : { null_value: 0 },
+    auth: opts.token ? createAuthExpressionValue(opts) : { null_value: null },
   };
 
   return {