diff --git a/CHANGELOG.md b/CHANGELOG.md
index 564b82f756c..9f8678351fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1,2 @@
+- Ignore `FIRESTORE_EMULATOR_HOST` environment variable on functions deploy. (#6442)
 - Added support for enabling, disabling, and displaying Point In Time Recovery enablement state on Firestore databases (#6388)
diff --git a/src/gcp/firestore.ts b/src/gcp/firestore.ts
index 2d3a3d7b82b..e5897c75f66 100644
--- a/src/gcp/firestore.ts
+++ b/src/gcp/firestore.ts
@@ -1,11 +1,11 @@
-import { firestoreOriginOrEmulator } from "../api";
+import { firestoreOrigin } from "../api";
 import { Client } from "../apiv2";
 import { logger } from "../logger";
 
 const apiClient = new Client({
   auth: true,
   apiVersion: "v1",
-  urlPrefix: firestoreOriginOrEmulator,
+  urlPrefix: firestoreOrigin,
 });
 
 interface Database {