diff --git a/packages/plugins/typescript/urql/src/visitor.ts b/packages/plugins/typescript/urql/src/visitor.ts
index 8daba7c4dc8..c6fc9059ad6 100644
--- a/packages/plugins/typescript/urql/src/visitor.ts
+++ b/packages/plugins/typescript/urql/src/visitor.ts
@@ -84,7 +84,7 @@ export const ${componentName} = (props: Omit<Urql.${operationType}Props<${generi
     operationVariablesTypes: string
   ): string {
     const operationName: string = this.convertName(node.name.value, {
-      suffix: pascalCase(operationType),
+      suffix: this.config.omitOperationSuffix ? '' : pascalCase(operationType),
       useTypesPrefix: false,
     });
 
diff --git a/packages/plugins/typescript/urql/tests/urql.spec.ts b/packages/plugins/typescript/urql/tests/urql.spec.ts
index 66d9dcf2b81..516d896fdd4 100644
--- a/packages/plugins/typescript/urql/tests/urql.spec.ts
+++ b/packages/plugins/typescript/urql/tests/urql.spec.ts
@@ -466,6 +466,20 @@ query MyFeed {
       expect(content.content).not.toContain(`export class ITestComponent`);
     });
 
+    it('should respect omitOperationSuffix for Component', async () => {
+      const docs = [{ location: '', document: basicDoc }];
+      const content = (await plugin(
+        schema,
+        docs,
+        { omitOperationSuffix: true },
+        {
+          outputFile: 'graphql.tsx',
+        }
+      )) as Types.ComplexPluginOutput;
+
+      expect(content.content).not.toContain(`export class TestComponent`);
+    });
+
     it('should add three generics if operation type is subscription', async () => {
       const documents = parse(/* GraphQL */ `
         subscription ListenToComments($name: String) {
@@ -601,5 +615,19 @@ export function useSubmitRepositoryMutation() {
 
       expect(content.content).toContain(`export function useTestQuery`);
     });
+
+    it('Should respect omitOperationSuffix for hooks', async () => {
+      const docs = [{ location: '', document: basicDoc }];
+      const content = (await plugin(
+        schema,
+        docs,
+        { withHooks: true, omitOperationSuffix: true },
+        {
+          outputFile: 'graphql.tsx',
+        }
+      )) as Types.ComplexPluginOutput;
+
+      expect(content.content).toContain(`export function useTest(`);
+    });
   });
 });