diff --git a/mlir/lib/Dialect/Transform/IR/TransformOps.cpp b/mlir/lib/Dialect/Transform/IR/TransformOps.cpp
index 51956ab9eddc2..3037cf65b3a01 100644
--- a/mlir/lib/Dialect/Transform/IR/TransformOps.cpp
+++ b/mlir/lib/Dialect/Transform/IR/TransformOps.cpp
@@ -123,8 +123,8 @@ LogicalResult PatternApplicatorExtension::findAllMatches(
 //===----------------------------------------------------------------------===//
 
 OperandRange
-transform::AlternativesOp::getSuccessorEntryOperands(unsigned index) {
-  if (getOperation()->getNumOperands() == 1)
+transform::AlternativesOp::getSuccessorEntryOperands(Optional<unsigned> index) {
+  if (index.hasValue() && getOperation()->getNumOperands() == 1)
     return getOperation()->getOperands();
   return OperandRange(getOperation()->operand_end(),
                       getOperation()->operand_end());