diff --git a/packages/client/src/types.ts b/packages/client/src/types.ts
index e2f010c34..13b3e0f92 100644
--- a/packages/client/src/types.ts
+++ b/packages/client/src/types.ts
@@ -51,6 +51,7 @@ export type DelegableOperationHandler<T extends string, E extends string> = (
   result: DelegableOperationResult<T, E>,
 ) => ResultAsync<TxHash, SigningError | ValidationError<E>>;
 
-export type OperationHandler<T extends string, E extends string> =
-  | RestrictedOperationHandler<E>
-  | DelegableOperationHandler<T, E>;
+export type OperationHandler<
+  T extends string = string,
+  E extends string = string,
+> = T extends string ? DelegableOperationHandler<T, E> : RestrictedOperationHandler<E>;
diff --git a/packages/client/src/viem/signer.ts b/packages/client/src/viem/signer.ts
index bd70861ff..98be5afcd 100644
--- a/packages/client/src/viem/signer.ts
+++ b/packages/client/src/viem/signer.ts
@@ -15,13 +15,7 @@ import type { Account, Hash, Transport, WalletClient } from 'viem';
 import { sendTransaction as sendEip1559Transaction } from 'viem/actions';
 import { sendEip712Transaction } from 'viem/zksync';
 import { SigningError, ValidationError } from '../errors';
-import {
-  type DelegableOperationHandler,
-  type OperationHandler,
-  type OperationResult,
-  type RestrictedOperationHandler,
-  isTransactionRequest,
-} from '../types';
+import { type OperationHandler, type OperationResult, isTransactionRequest } from '../types';
 
 async function sendTransaction(
   walletClient: WalletClient<Transport, chains.LensNetworkChain, Account>,
@@ -69,15 +63,9 @@ function signWith(
   );
 }
 
-export function handleWith<T extends string, E extends string>(
-  walletClient: WalletClient<Transport, chains.LensNetworkChain, Account>,
-): DelegableOperationHandler<T, E>;
-export function handleWith<E extends string>(
-  walletClient: WalletClient<Transport, chains.LensNetworkChain, Account>,
-): RestrictedOperationHandler<E>;
-export function handleWith<T extends string, E extends string>(
+export function handleWith(
   walletClient: WalletClient<Transport, chains.LensNetworkChain, Account>,
-): OperationHandler<T, E> {
+): OperationHandler {
   return <T extends string, E extends string>(
     result: OperationResult<T, E>,
   ): ResultAsync<TxHash, SigningError | ValidationError<E>> => {