diff --git a/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp b/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp
--- a/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp
+++ b/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp
@@ -1639,11 +1639,11 @@
               CollapseMixedReshapeOps<CollapseShapeOp, ExpandShapeOp>,
               CollapseShapeOpMemRefCastFolder>(context);
 }
+
 OpFoldResult ExpandShapeOp::fold(ArrayRef<Attribute> operands) {
-  if (succeeded(foldMemRefCast(*this)))
-    return getResult();
   return foldReshapeOp<ExpandShapeOp, CollapseShapeOp>(*this, operands);
 }
+
 OpFoldResult CollapseShapeOp::fold(ArrayRef<Attribute> operands) {
   return foldReshapeOp<CollapseShapeOp, ExpandShapeOp>(*this, operands);
 }
diff --git a/mlir/test/Dialect/MemRef/canonicalize.mlir b/mlir/test/Dialect/MemRef/canonicalize.mlir
--- a/mlir/test/Dialect/MemRef/canonicalize.mlir
+++ b/mlir/test/Dialect/MemRef/canonicalize.mlir
@@ -614,6 +614,8 @@
   return %collapsed : memref<?x?xf32>
 }
 
+// -----
+
 // CHECK-LABEL:   func @collapse_after_memref_cast(
 // CHECK-SAME:      %[[INPUT:.*]]: memref<?x512x1x?xf32>) -> memref<?x?xf32> {
 // CHECK:           %[[COLLAPSED:.*]] = memref.collapse_shape %[[INPUT]]
@@ -624,3 +626,28 @@
   %collapsed = memref.collapse_shape %dynamic [[0], [1, 2, 3]] : memref<?x?x?x?xf32> into memref<?x?xf32>
   return %collapsed : memref<?x?xf32>
 }
+
+// -----
+
+// CHECK-LABEL:   func @expand_after_memref_cast_type_change(
+// CHECK-SAME:      %[[INPUT:.*]]: memref<1x?xf32>) -> memref<?x512x1x?xf32> {
+// CHECK:           %[[CAST:.*]] = memref.cast %[[INPUT]] : memref<1x?xf32> to memref<?x?xf32>
+// CHECK:           %[[EXPANDED:.*]] = memref.expand_shape %[[CAST]] {{\[\[}}0], [1, 2, 3]] : memref<?x?xf32> into memref<?x512x1x?xf32>
+// CHECK:           return %[[EXPANDED]] : memref<?x512x1x?xf32>
+func @expand_after_memref_cast_type_change(%arg0 : memref<1x?xf32>) -> memref<?x512x1x?xf32> {
+  %dynamic = memref.cast %arg0: memref<1x?xf32> to memref<?x?xf32>
+  %expanded = memref.expand_shape %dynamic [[0], [1, 2, 3]] : memref<?x?xf32> into memref<?x512x1x?xf32>
+  return %expanded: memref<?x512x1x?xf32>
+}
+
+// -----
+
+// CHECK-LABEL:   func @expand_after_memref_cast(
+// CHECK-SAME:      %[[INPUT:.*]]: memref<?x?xf32>) -> memref<?x512x1x?xf32> {
+// CHECK:           %[[EXPANDED:.*]] = memref.expand_shape %[[INPUT]] {{\[\[}}0], [1, 2, 3]] : memref<?x?xf32> into memref<?x512x1x?xf32>
+// CHECK:           return %[[EXPANDED]] : memref<?x512x1x?xf32>
+func @expand_after_memref_cast(%arg0 : memref<?x?xf32>) -> memref<?x512x1x?xf32> {
+  %dynamic = memref.cast %arg0: memref<?x?xf32> to memref<?x?xf32>
+  %expanded = memref.expand_shape %dynamic [[0], [1, 2, 3]] : memref<?x?xf32> into memref<?x512x1x?xf32>
+  return %expanded: memref<?x512x1x?xf32>
+}