diff --git a/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
index 75b96eaec0..f641a487cd 100644
--- a/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
@@ -93,20 +93,13 @@ public class RMPermissionServiceImpl extends PermissionServiceImpl
         {
             return super.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS);
         }
-        // Added ADD_CHILDREN check in for MNT-16852.
+        // Added ADD_CHILDREN and WRITE_PROPERTIES check in for MNT-16852.
         else if (AccessStatus.DENIED.equals(acs) &&
-                (PermissionService.WRITE.equals(perm) || PermissionService.ADD_CHILDREN.equals(perm)) &&
+                (PermissionService.WRITE.equals(perm) || PermissionService.ADD_CHILDREN.equals(perm) || PermissionService.WRITE_PROPERTIES.equals(perm)) &&
                  nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
         {
             return super.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS);
         }
-        // Add WRITE_PROPERTIES check in for MNT-16852.
-        else if (AccessStatus.DENIED.equals(acs) &&
-                PermissionService.WRITE_PROPERTIES.equals(perm) &&
-                nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
-        {
-            return super.hasPermission(nodeRef, RMPermissionModel.EDIT_RECORD_METADATA);
-        }
 
         return acs;
     }