diff --git a/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentOptionalPropDataA.ts b/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentOptionalPropDataA.ts
index 341bff9bda78..51a636e98e7a 100644
--- a/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentOptionalPropDataA.ts
+++ b/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentOptionalPropDataA.ts
@@ -1,7 +1,6 @@
 export function commentOptionalPropDataA(id: string) {
   return {
     id: id,
-    country: 'France',
     content: {
       set: {
         text: 'Hello World',
diff --git a/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredListDataA.ts b/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredListDataA.ts
index ad632baa3a50..dd68fc9cceb9 100644
--- a/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredListDataA.ts
+++ b/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredListDataA.ts
@@ -1,7 +1,6 @@
 export function commentRequiredListDataA(id: string) {
   return {
     id: id,
-    country: 'France',
     contents: {
       set: {
         text: 'Hello World',
diff --git a/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredPropDataA.ts b/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredPropDataA.ts
index 9828af027909..608c517c6cd3 100644
--- a/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredPropDataA.ts
+++ b/packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredPropDataA.ts
@@ -1,7 +1,6 @@
 export function commentRequiredPropDataA(id: string) {
   return {
     id: id,
-    country: 'France',
     content: {
       set: {
         text: 'Hello World',
diff --git a/packages/client/src/__tests__/integration/happy/composites-mongo/findFirst/optional.ts b/packages/client/src/__tests__/integration/happy/composites-mongo/findFirst/optional.ts
index 5d71e1e50680..8755a68ebac1 100644
--- a/packages/client/src/__tests__/integration/happy/composites-mongo/findFirst/optional.ts
+++ b/packages/client/src/__tests__/integration/happy/composites-mongo/findFirst/optional.ts
@@ -1,4 +1,5 @@
 import { getTestClient } from '../../../../../utils/getTestClient'
+import { commentOptionalPropDataA } from '../__helpers__/build-data/commentOptionalPropDataA'
 
 const describeIf = (condition: boolean) => (condition ? describe : describe.skip)
 
@@ -17,21 +18,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findFirst > optional', () => {
 
   beforeEach(async () => {
     await prisma.commentOptionalProp.deleteMany({ where: { id } })
-    await prisma.commentOptionalProp.create({
-      data: {
-        id,
-        country: 'France',
-        content: {
-          set: {
-            text: 'Hello World',
-            upvotes: {
-              vote: true,
-              userId: '10',
-            },
-          },
-        },
-      },
-    })
+    await prisma.commentOptionalProp.create({ data: commentOptionalPropDataA(id) })
   })
 
   afterEach(async () => {
@@ -57,7 +44,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findFirst > optional', () => {
             },
           ],
         },
-        country: France,
+        country: null,
         id: 7aaaaaaaaaaaaaaaaaaaaaaa,
       }
     `)
@@ -113,9 +100,20 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findFirst > optional', () => {
             },
           ],
         },
-        country: France,
+        country: null,
         id: 7aaaaaaaaaaaaaaaaaaaaaaa,
       }
     `)
   })
+
+  /**
+   * Filter isSet
+   */
+  test('filter isSet', async () => {
+    const comment = await prisma.commentOptionalProp.findFirst({
+      where: { id, country: { isSet: true } },
+    })
+
+    expect(comment).toMatchInlineSnapshot(`null`)
+  })
 })
diff --git a/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/list.ts b/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/list.ts
index f5553a41b344..d9e8e4c6028d 100644
--- a/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/list.ts
+++ b/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/list.ts
@@ -51,7 +51,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > list', () => {
               ],
             },
           ],
-          country: France,
+          country: null,
           id: 9bbbbbbbbbbbbbbbbbbbbbbb,
         },
       ]
@@ -141,7 +141,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > list', () => {
               ],
             },
           ],
-          country: France,
+          country: null,
           id: 9bbbbbbbbbbbbbbbbbbbbbbb,
         },
       ]
@@ -173,7 +173,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > list', () => {
               ],
             },
           ],
-          country: France,
+          country: null,
           id: 9bbbbbbbbbbbbbbbbbbbbbbb,
         },
       ]
@@ -192,24 +192,24 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > list', () => {
     })
 
     expect(comment).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            contents: Array [
-              Object {
-                text: Hello World,
-                upvotes: Array [
-                  Object {
-                    userId: 10,
-                    vote: true,
-                  },
-                ],
-              },
-            ],
-            country: France,
-            id: 9bbbbbbbbbbbbbbbbbbbbbbb,
-          },
-        ]
-      `)
+      Array [
+        Object {
+          contents: Array [
+            Object {
+              text: Hello World,
+              upvotes: Array [
+                Object {
+                  userId: 10,
+                  vote: true,
+                },
+              ],
+            },
+          ],
+          country: null,
+          id: 9bbbbbbbbbbbbbbbbbbbbbbb,
+        },
+      ]
+    `)
   })
 
   /**
@@ -237,7 +237,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > list', () => {
               ],
             },
           ],
-          country: France,
+          country: null,
           id: 9bbbbbbbbbbbbbbbbbbbbbbb,
         },
       ]
@@ -359,7 +359,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > list', () => {
               ],
             },
           ],
-          country: France,
+          country: null,
           id: 9bbbbbbbbbbbbbbbbbbbbbbb,
         },
       ]
diff --git a/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/optional.ts b/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/optional.ts
index 161729fcca3d..b1f0d29ed354 100644
--- a/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/optional.ts
+++ b/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/optional.ts
@@ -49,7 +49,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > optional', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 8aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -126,7 +126,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > optional', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 8aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -156,7 +156,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > optional', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 8aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -186,7 +186,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > optional', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 8aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -233,7 +233,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > optional', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 8aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -263,10 +263,42 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > optional', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 8aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
     `)
   })
+
+  /**
+   * Filter isSet
+   */
+  test('filter isSet', async () => {
+    const comment = await prisma.commentOptionalProp.findFirst({
+      where: {
+        OR: [{ id: id1 }, { id: id2 }],
+        country: { isSet: true },
+      },
+    })
+
+    expect(comment).toMatchInlineSnapshot(`
+      Object {
+        content: Object {
+          text: Goodbye World,
+          upvotes: Array [
+            Object {
+              userId: 11,
+              vote: false,
+            },
+            Object {
+              userId: 12,
+              vote: true,
+            },
+          ],
+        },
+        country: France,
+        id: 1ddddddddddddddddddddddd,
+      }
+    `)
+  })
 })
diff --git a/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/required.ts b/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/required.ts
index 74f67cc430fd..dc2c29123416 100644
--- a/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/required.ts
+++ b/packages/client/src/__tests__/integration/happy/composites-mongo/findMany/required.ts
@@ -49,7 +49,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > required', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 3aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -126,7 +126,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > required', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 3aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -156,7 +156,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > required', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 3aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -186,7 +186,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > required', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 3aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -233,7 +233,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > required', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 3aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]
@@ -263,7 +263,7 @@ describeIf(!process.env.TEST_SKIP_MONGODB)('findMany > required', () => {
               },
             ],
           },
-          country: France,
+          country: null,
           id: 3aaaaaaaaaaaaaaaaaaaaaaa,
         },
       ]