diff --git a/src/FSAL/fsal_helper.c b/src/FSAL/fsal_helper.c
index 37c6f1f..c517715 100644
--- a/src/FSAL/fsal_helper.c
+++ b/src/FSAL/fsal_helper.c
@@ -231,7 +231,12 @@ static fsal_status_t fsal_check_setattr_perms(struct fsal_obj_handle *obj,
                                    "Change OWNER requires FSAL_ACE_PERM_WRITE_OWNER");
                }
        }
-       if (FSAL_TEST_MASK(attr->valid_mask, ATTR_GROUP)) {
+       /* Check if we are changing the owner_group, if owner_group is passed,
+        * but is the current owner_group, then that will be considered a
+        * NO-OP and allowed.
+        */
+       if (FSAL_TEST_MASK(attr->valid_mask, ATTR_GROUP) &&
+           attr->group != current->group) {
                /* non-root is only allowed to change group_owner to a group
                 * user is a member of. */
                int not_in_group = fsal_not_in_group_list(attr->group);
diff --git a/src/libntirpc b/src/libntirpc
--- a/src/libntirpc
+++ b/src/libntirpc
@@ -1 +1 @@
-Subproject commit 5575ddb022b996c318d263e504273ee6a34499a3
+Subproject commit 5575ddb022b996c318d263e504273ee6a34499a3-dirty