diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc
index 214d88d1a63..7830e897109 100644
--- a/source/blender/blenkernel/intern/geometry_set.cc
+++ b/source/blender/blenkernel/intern/geometry_set.cc
@@ -353,7 +353,10 @@ void GeometrySet::replace_mesh(Mesh *mesh, GeometryOwnershipType ownership)
     this->remove<MeshComponent>();
     return;
   }
-
+  if (mesh == this->get_mesh_for_read()) {
+    return;
+  }
+  this->remove<MeshComponent>();
   MeshComponent &component = this->get_component_for_write<MeshComponent>();
   component.replace(mesh, ownership);
 }
@@ -364,7 +367,10 @@ void GeometrySet::replace_curve(CurveEval *curve, GeometryOwnershipType ownershi
     this->remove<CurveComponent>();
     return;
   }
-
+  if (curve == this->get_curve_for_read()) {
+    return;
+  }
+  this->remove<CurveComponent>();
   CurveComponent &component = this->get_component_for_write<CurveComponent>();
   component.replace(curve, ownership);
 }
@@ -375,7 +381,10 @@ void GeometrySet::replace_pointcloud(PointCloud *pointcloud, GeometryOwnershipTy
     this->remove<PointCloudComponent>();
     return;
   }
-
+  if (pointcloud == this->get_pointcloud_for_read()) {
+    return;
+  }
+  this->remove<PointCloudComponent>();
   PointCloudComponent &component = this->get_component_for_write<PointCloudComponent>();
   component.replace(pointcloud, ownership);
 }
@@ -386,7 +395,10 @@ void GeometrySet::replace_volume(Volume *volume, GeometryOwnershipType ownership
     this->remove<VolumeComponent>();
     return;
   }
-
+  if (volume == this->get_volume_for_read()) {
+    return;
+  }
+  this->remove<VolumeComponent>();
   VolumeComponent &component = this->get_component_for_write<VolumeComponent>();
   component.replace(volume, ownership);
 }