diff --git a/source/blender/blenkernel/intern/object_deform.cc b/source/blender/blenkernel/intern/object_deform.cc
index 99c48ed2fec..cc51e7bf9a0 100644
--- a/source/blender/blenkernel/intern/object_deform.cc
+++ b/source/blender/blenkernel/intern/object_deform.cc
@@ -793,12 +793,15 @@ bool *BKE_object_defgroup_subset_from_select_type(Object *ob,
     case WT_VGROUP_BONE_DEFORM: {
       int i;
       defgroup_validmap = BKE_object_defgroup_validmap_get(ob, *r_defgroup_tot);
+      const bool *locked_vgroups = BKE_object_defgroup_lock_flags_get(ob, *r_defgroup_tot);
       *r_subset_count = 0;
       for (i = 0; i < *r_defgroup_tot; i++) {
+        defgroup_validmap[i] &= !(locked_vgroups && locked_vgroups[i]);
         if (defgroup_validmap[i] == true) {
           *r_subset_count += 1;
         }
       }
+      MEM_SAFE_FREE(locked_vgroups);
       break;
     }
     case WT_VGROUP_BONE_DEFORM_OFF: {