diff --git a/.changeset/light-moose-join.md b/.changeset/light-moose-join.md
new file mode 100644
index 00000000..2ed098a3
--- /dev/null
+++ b/.changeset/light-moose-join.md
@@ -0,0 +1,5 @@
+---
+'@0no-co/graphqlsp': patch
+---
+
+Add `nonOptionalTypename: true` as this allows for easier type matching
diff --git a/packages/graphqlsp/src/graphql/generateTypes.ts b/packages/graphqlsp/src/graphql/generateTypes.ts
index 0f0ea8f8..2de34d67 100644
--- a/packages/graphqlsp/src/graphql/generateTypes.ts
+++ b/packages/graphqlsp/src/graphql/generateTypes.ts
@@ -22,6 +22,7 @@ export const generateBaseTypes = async (
       avoidOptionals: false,
       enumsAsTypes: true,
       globalNamespace: true,
+      nonOptionalTypename: true,
     },
     filename: outputFile,
     schema: parse(printSchema(schema)),
@@ -79,10 +80,11 @@ export const generateTypedDocumentNodes = async (
       },
     ],
     config: {
-      namespacedImportName: 'Types',
       scalars,
       avoidOptionals: false,
       enumsAsTypes: true,
+      nonOptionalTypename: true,
+      namespacedImportName: 'Types',
     },
     filename: outputFile,
     schema: parse(printSchema(schema)),