diff --git a/source/blender/makesrna/intern/rna_mesh_utils.h b/source/blender/makesrna/intern/rna_mesh_utils.h
index 2b01c98b35b..a08f0bfb5f5 100644
--- a/source/blender/makesrna/intern/rna_mesh_utils.h
+++ b/source/blender/makesrna/intern/rna_mesh_utils.h
@@ -108,6 +108,12 @@
     Mesh *me = rna_mesh(ptr); \
     CustomData *data = rna_mesh_##customdata_type(ptr); \
     if (data) { \
+      if (UNLIKELY(value < 0)) { \
+        value = 0; \
+      } \
+      else if (value > 0) { \
+        value = min_ii(value, CustomData_number_of_layers(data, layer_type) - 1); \
+      } \
       CustomData_set_layer_##active_type(data, layer_type, value); \
       BKE_mesh_tessface_clear(me); \
     } \