diff --git a/src/resolvers/helpers/filter.js b/src/resolvers/helpers/filter.js
index 0bfe64f9..298c4166 100644
--- a/src/resolvers/helpers/filter.js
+++ b/src/resolvers/helpers/filter.js
@@ -77,7 +77,7 @@ export const filterHelperArgs = (
 
   return {
     filter: {
-      type: opts.isRequired ? itc.getTypeAsRequired() : itc.getType(),
+      type: opts.isRequired ? itc.getTypeNonNull() : itc.getType(),
       description: opts.onlyIndexed ? 'Filter only by indexed fields' : 'Filter by fields',
     },
   };
diff --git a/src/resolvers/helpers/filterOperators.js b/src/resolvers/helpers/filterOperators.js
index ca8f359f..608c1647 100644
--- a/src/resolvers/helpers/filterOperators.js
+++ b/src/resolvers/helpers/filterOperators.js
@@ -32,8 +32,8 @@ export function addFilterOperators(
   }
 
   itc.addFields({
-    OR: [itc.getTypeAsRequired()],
-    AND: [itc.getTypeAsRequired()],
+    OR: [itc.getTypeNonNull()],
+    AND: [itc.getTypeNonNull()],
   });
 }
 
diff --git a/src/resolvers/helpers/record.js b/src/resolvers/helpers/record.js
index 071bc9d3..ee8e0944 100644
--- a/src/resolvers/helpers/record.js
+++ b/src/resolvers/helpers/record.js
@@ -41,7 +41,7 @@ export const recordHelperArgs = (
 
   return {
     record: {
-      type: opts.isRequired ? recordITC.getTypeAsRequired() : recordITC.getType(),
+      type: opts.isRequired ? recordITC.getTypeNonNull() : recordITC.getType(),
     },
   };
 };