diff --git a/src/app/maptools/qgsavoidintersectionsoperation.cpp b/src/app/maptools/qgsavoidintersectionsoperation.cpp
index 9ad17c33f3e9..b963ebf5241e 100644
--- a/src/app/maptools/qgsavoidintersectionsoperation.cpp
+++ b/src/app/maptools/qgsavoidintersectionsoperation.cpp
@@ -46,8 +46,7 @@ Qgis::GeometryOperationResult QgsAvoidIntersectionsOperation::apply( QgsVectorLa
   bool geomHasChanged = false;
   switch ( avoidIntersectionsReturn )
   {
-      geomHasChanged = true;
-    case Qgis::GeometryOperationResult::OperationChangedGeometryType: // Geometry type was changed, let's try our best to make it compatible with the target layer
+    case Qgis::GeometryOperationResult::GeometryTypeHasChanged: // Geometry type was changed, let's try our best to make it compatible with the target layer
     {
       geomHasChanged = true;
       const QVector<QgsGeometry> newGeoms = geom.coerceToType( layer->wkbType() );
@@ -97,6 +96,7 @@ Qgis::GeometryOperationResult QgsAvoidIntersectionsOperation::apply( QgsVectorLa
     }
 
     case Qgis::GeometryOperationResult::InvalidBaseGeometry:
+      geomHasChanged = true;
       emit messageEmitted( tr( "At least one geometry intersected is invalid. These geometries must be manually repaired." ), Qgis::MessageLevel::Warning );
       break;