diff --git a/frontend/src/hooks/tools/shared/useBaseTool.ts b/frontend/src/hooks/tools/shared/useBaseTool.ts
index 723f95e44..996fae712 100644
--- a/frontend/src/hooks/tools/shared/useBaseTool.ts
+++ b/frontend/src/hooks/tools/shared/useBaseTool.ts
@@ -6,12 +6,12 @@ import { ToolOperationHook } from './useToolOperation';
 import { BaseParametersHook } from './useBaseParameters';
 import { StirlingFile } from '../../../types/fileContext';
 
-interface BaseToolReturn<TParams> {
+interface BaseToolReturn<TParams, TParamsHook extends BaseParametersHook<TParams>> {
   // File management
   selectedFiles: StirlingFile[];
 
   // Tool-specific hooks
-  params: BaseParametersHook<TParams>;
+  params: TParamsHook;
   operation: ToolOperationHook<TParams>;
 
   // Endpoint validation
@@ -33,13 +33,13 @@ interface BaseToolReturn<TParams> {
 /**
  * Base tool hook for tool components. Manages standard behaviour for tools.
  */
-export function useBaseTool<TParams>(
+export function useBaseTool<TParams, TParamsHook extends BaseParametersHook<TParams>>(
   toolName: string,
-  useParams: () => BaseParametersHook<TParams>,
+  useParams: () => TParamsHook,
   useOperation: () => ToolOperationHook<TParams>,
   props: BaseToolProps,
   options?: { minFiles?: number }
-): BaseToolReturn<TParams> {
+): BaseToolReturn<TParams, TParamsHook> {
   const minFiles = options?.minFiles ?? 1;
   const { onPreviewFile, onComplete, onError } = props;