diff --git a/third_party/mlir/lib/Transforms/DialectConversion.cpp b/third_party/mlir/lib/Transforms/DialectConversion.cpp
index a47f17b28a6..d65eae7f38b 100644
--- a/third_party/mlir/lib/Transforms/DialectConversion.cpp
+++ b/third_party/mlir/lib/Transforms/DialectConversion.cpp
@@ -284,6 +284,7 @@ void ArgConverter::applySignatureConversion(
   // Remap each of the original arguments as determined by the signature
   // conversion.
   auto &newArgMapping = argMapping[block];
+  OpBuilder::InsertionGuard guard(rewriter);
   rewriter.setInsertionPointToStart(block);
   for (unsigned i = 0; i != origArgCount; ++i) {
     ArrayRef<Value *> remappedValues;