diff --git a/packages/firestore/scripts/remove-asserts.ts b/packages/firestore/scripts/remove-asserts.ts
index e64c2c00574..22e3b17a099 100644
--- a/packages/firestore/scripts/remove-asserts.ts
+++ b/packages/firestore/scripts/remove-asserts.ts
@@ -49,6 +49,8 @@ class RemoveAsserts {
   }
 
   visitNode(node: ts.Node): ts.Node {
+    let updatedNode: ts.Node | null = null;
+
     if (ts.isCallExpression(node)) {
       const signature = this.typeChecker.getResolvedSignature(node);
       if (
@@ -63,19 +65,31 @@ class RemoveAsserts {
         ) {
           const method = declaration.name!.text;
           if (method === 'debugAssert') {
-            return ts.createEmptyStatement();
+            updatedNode = ts.createEmptyStatement();
           } else if (method === 'hardAssert') {
             // Remove the log message but keep the assertion
-            return ts.createCall(declaration.name!, /*typeArgs*/ undefined, [
-              node.arguments[0]
-            ]);
+            updatedNode = ts.createCall(
+              declaration.name!,
+              /*typeArgs*/ undefined,
+              [node.arguments[0]]
+            );
           } else if (method === 'fail') {
             // Remove the log message
-            return ts.createCall(declaration.name!, /*typeArgs*/ undefined, []);
+            updatedNode = ts.createCall(
+              declaration.name!,
+              /*typeArgs*/ undefined,
+              []
+            );
           }
         }
       }
     }
-    return node;
+
+    if (updatedNode) {
+      ts.setSourceMapRange(updatedNode, ts.getSourceMapRange(node));
+      return updatedNode;
+    } else {
+      return node;
+    }
   }
 }
diff --git a/packages/firestore/scripts/rename-internals.ts b/packages/firestore/scripts/rename-internals.ts
index 4f094a03456..ff78b5594b7 100644
--- a/packages/firestore/scripts/rename-internals.ts
+++ b/packages/firestore/scripts/rename-internals.ts
@@ -49,7 +49,9 @@ class RenameInternals {
         !this.publicApi.has(name) &&
         blacklist.indexOf(node.escapedText.toString()) === -1
       ) {
-        return ts.createIdentifier(this.prefix + name);
+        const newIdentifier = ts.createIdentifier(this.prefix + name);
+        ts.setSourceMapRange(newIdentifier, ts.getSourceMapRange(node));
+        return newIdentifier;
       }
     }