diff --git a/src/graphql/schema/withNullableType.js b/src/graphql/schema/withNullableType.js index 739c382a38..171d727357 100644 --- a/src/graphql/schema/withNullableType.js +++ b/src/graphql/schema/withNullableType.js @@ -2,8 +2,9 @@ const { GraphQLNonNull } = require('graphql'); const withNullableType = (field, type) => { const hasReadAccessControl = field.access && field.access.read; + const condition = field.admin && field.admin.condition; - if (field.required && !field.localized && !hasReadAccessControl) { + if (field.required && !field.localized && !condition && !hasReadAccessControl) { return new GraphQLNonNull(type); }