diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index acca27b63f2..a94ef587214 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -4479,7 +4479,13 @@ Mesh *BKE_object_get_evaluated_mesh(const Object *object)
     return nullptr;
   }
 
-  if (object->data && GS(((const ID *)object->data)->name) == ID_ME) {
+  const ID *object_data = static_cast<const ID *>(object->data);
+  if (object_data == nullptr) {
+    return mesh;
+  }
+
+  const ID_Type data_type = GS(object_data->name);
+  if (ELEM(data_type, ID_ME, ID_CV)) {
     mesh = BKE_mesh_wrapper_ensure_subdivision(mesh);
   }