diff --git a/src/components/menus/content-contextual-menu.tsx b/src/components/menus/content-contextual-menu.tsx
index d5c54e01..7d599ad1 100644
--- a/src/components/menus/content-contextual-menu.tsx
+++ b/src/components/menus/content-contextual-menu.tsx
@@ -309,14 +309,12 @@ export default function ContentContextualMenu(props: Readonly<ContentContextualM
         moveElementsToDirectory,
         undefined,
         moveElementErrorToString,
-        moveElementOnError,
-        false
+        moveElementOnError
     );
 
     const [renameCB, renameState] = useDeferredFetch(
-        // @ts-expect-error refacto typing of useDefferedFetch
         renameElement,
-        (_elementUuid: string, renamedElement: any[]) => {
+        (renamedElement: any[]) => {
             // if copied element is renamed
             if (itemSelectionForCopy.sourceItemUuid === renamedElement[0]) {
                 dispatch(
@@ -342,41 +340,35 @@ export default function ContentContextualMenu(props: Readonly<ContentContextualM
                 return intl.formatMessage({ id: 'renameElementNotFoundError' });
             }
             return undefined;
-        },
-        undefined,
-        false
+        }
     );
 
     const [FiltersReplaceWithScriptCB] = useDeferredFetch(
         replaceFiltersWithScript,
         handleCloseDialog,
         undefined,
-        handleLastError,
-        false
+        handleLastError
     );
 
     const [newScriptFromFiltersContingencyListCB] = useDeferredFetch(
         newScriptFromFiltersContingencyList,
         handleCloseDialog,
         undefined,
-        handleLastError,
-        false
+        handleLastError
     );
 
     const [replaceFormContingencyListWithScriptCB] = useDeferredFetch(
         replaceFormContingencyListWithScript,
         handleCloseDialog,
         undefined,
-        handleLastError,
-        false
+        handleLastError
     );
 
     const [newScriptFromFilterCB] = useDeferredFetch(
         newScriptFromFilter,
         handleCloseDialog,
         undefined,
-        handleLastError,
-        false
+        handleLastError
     );
 
     const noCreationInProgress = useCallback(() => selectedElements.every((el) => el.hasMetadata), [selectedElements]);
diff --git a/src/components/menus/directory-tree-contextual-menu.tsx b/src/components/menus/directory-tree-contextual-menu.tsx
index 5500c57d..68ee600c 100644
--- a/src/components/menus/directory-tree-contextual-menu.tsx
+++ b/src/components/menus/directory-tree-contextual-menu.tsx
@@ -55,7 +55,7 @@ import { buildPathToFromMap } from '../treeview-utils';
 
 export interface DirectoryTreeContextualMenuProps extends Omit<CommonContextualMenuProps, 'onClose'> {
     directory: ElementAttributes | null;
-    onClose: (nextSelectedDirectoryId?: string | null) => void;
+    onClose: () => void;
     openDialog: string;
     setOpenDialog: (dialogId: string) => void;
     restrictMenuItems: boolean;
@@ -80,38 +80,23 @@ export default function DirectoryTreeContextualMenu(props: Readonly<DirectoryTre
         setOpenDialog(dialogId);
     };
 
-    const handleCloseDialog = useCallback(
-        (nextSelectedDirectoryId: string | null = null) => {
-            onClose(nextSelectedDirectoryId);
-            setOpenDialog(DialogsId.NONE);
-            setHideMenu(false);
-            setDeleteError('');
-        },
-        [onClose, setOpenDialog]
-    );
+    const handleCloseDialog = useCallback(() => {
+        onClose();
+        setOpenDialog(DialogsId.NONE);
+        setHideMenu(false);
+        setDeleteError('');
+    }, [onClose, setOpenDialog]);
 
-    const [renameCB, renameState] = useDeferredFetch(
-        // @ts-expect-error refacto typing of useDefferedFetch
-        renameElement,
-        handleCloseDialog,
-        (HTTPStatusCode: number) => {
-            if (HTTPStatusCode === 403) {
-                return intl.formatMessage({ id: 'renameDirectoryError' });
-            }
-            return undefined;
-        },
-        undefined,
-        false
-    );
+    const [renameCB, renameState] = useDeferredFetch(renameElement, handleCloseDialog, (HTTPStatusCode: number) => {
+        if (HTTPStatusCode === 403) {
+            return intl.formatMessage({ id: 'renameDirectoryError' });
+        }
+        return undefined;
+    });
 
-    const [insertDirectoryCB, insertDirectoryState] = useDeferredFetch(insertDirectory, (response: ElementAttributes) =>
-        handleCloseDialog(response?.elementUuid)
-    );
+    const [insertDirectoryCB, insertDirectoryState] = useDeferredFetch(insertDirectory, handleCloseDialog);
 
-    const [insertRootDirectoryCB, insertRootDirectoryState] = useDeferredFetch(
-        insertRootDirectory,
-        (response: ElementAttributes) => handleCloseDialog(response?.elementUuid)
-    );
+    const [insertRootDirectoryCB, insertRootDirectoryState] = useDeferredFetch(insertRootDirectory, handleCloseDialog);
 
     const itemSelectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
 
@@ -196,14 +181,14 @@ export default function DirectoryTreeContextualMenu(props: Readonly<DirectoryTre
         (elementsUuid: UUID) => {
             setDeleteError('');
             deleteElement(elementsUuid)
-                .then(() => handleCloseDialog(directory?.parentUuid))
+                .then(handleCloseDialog)
                 .catch((error: any) => {
                     // show the error message and don't close the dialog
                     setDeleteError(error.message);
                     handleError(error.message);
                 });
         },
-        [handleCloseDialog, directory?.parentUuid, handleError]
+        [handleCloseDialog, handleError]
     );
 
     // Allowance
@@ -302,7 +287,7 @@ export default function DirectoryTreeContextualMenu(props: Readonly<DirectoryTre
                     });
                 });
             }
-            handleCloseDialog(null);
+            handleCloseDialog();
         },
         [directory, handleCloseDialog, snackError, treeData.mapData]
     );
diff --git a/src/components/toolbars/content-toolbar.tsx b/src/components/toolbars/content-toolbar.tsx
index b47e6e9f..40698012 100644
--- a/src/components/toolbars/content-toolbar.tsx
+++ b/src/components/toolbars/content-toolbar.tsx
@@ -94,8 +94,7 @@ export default function ContentToolbar(props: Readonly<ContentToolbarProps>) {
         moveElementsToDirectory,
         undefined,
         moveElementErrorToString,
-        moveElementOnError,
-        false
+        moveElementOnError
     );
 
     // Allowance
diff --git a/src/utils/custom-hooks.ts b/src/utils/custom-hooks.ts
index 91084444..eab8734d 100644
--- a/src/utils/custom-hooks.ts
+++ b/src/utils/custom-hooks.ts
@@ -67,10 +67,9 @@ interface MultipleAction<T> {
  */
 export const useDeferredFetch = <T, TArgs extends unknown[] = any[]>(
     fetchFunction: GenericFunction<T, TArgs>,
-    onSuccess?: (data: T, args: TArgs) => void,
+    onSuccess?: (args: TArgs, data?: T) => void,
     errorToString?: (status: number) => string | undefined,
-    onError?: (errorMessage: string, args: TArgs) => void,
-    hasResult: boolean = true
+    onError?: (errorMessage: string, args: TArgs) => void
 ): [(...args: TArgs) => void, FetchState<T>] => {
     const initialState: FetchState<T> = {
         status: FetchStatus.IDLE,
@@ -124,25 +123,12 @@ export const useDeferredFetch = <T, TArgs extends unknown[] = any[]>(
             dispatch({ type: ActionType.START });
             try {
                 // Params resolution
-                const response = await fetchFunction(...args);
-
-                if (hasResult) {
-                    const data = response;
-                    dispatch({
-                        type: ActionType.SUCCESS,
-                        payload: data,
-                    });
-                    if (onSuccess) {
-                        onSuccess(data, args);
-                    }
-                } else {
-                    dispatch({
-                        type: ActionType.SUCCESS,
-                    });
-                    if (onSuccess) {
-                        onSuccess(null as unknown as T, args);
-                    }
-                }
+                const data = await fetchFunction(...args);
+                dispatch({
+                    type: ActionType.SUCCESS,
+                    payload: data,
+                });
+                onSuccess?.(args, data);
             } catch (error: any) {
                 if (!error.status) {
                     // an http error
@@ -153,7 +139,7 @@ export const useDeferredFetch = <T, TArgs extends unknown[] = any[]>(
                 }
             }
         },
-        [fetchFunction, onSuccess, handleError, hasResult]
+        [fetchFunction, onSuccess, handleError]
     );
 
     const fetchCallback = useCallback((...args: TArgs) => fetchData(...args), [fetchData]);
@@ -186,8 +172,7 @@ export const useMultipleDeferredFetch = <T>(
     fetchFunction: GenericFunction<T>,
     onSuccess?: (data: T[]) => void,
     errorToString?: (status: number) => string | undefined,
-    onError?: (errorMessages: string[], params: unknown[], paramsOnError: unknown[]) => void,
-    hasResult: boolean = true
+    onError?: (errorMessages: string[], params: unknown[], paramsOnError: unknown[]) => void
 ): [(cbParamsList: unknown[][]) => void] => {
     const initialState: MultipleFetchState<T> = {
         public: {
@@ -253,7 +238,7 @@ export const useMultipleDeferredFetch = <T>(
 
     const [paramList, setParamList] = useState<unknown[][]>([]);
 
-    const onInstanceSuccess = useCallback((data: T, paramsOnSuccess: unknown[]) => {
+    const onInstanceSuccess = useCallback((paramsOnSuccess: unknown[], data?: T) => {
         dispatch({
             type: ActionType.ADD_SUCCESS,
             payload: data,
@@ -271,7 +256,7 @@ export const useMultipleDeferredFetch = <T>(
         });
     }, []);
 
-    const [fetchCB] = useDeferredFetch(fetchFunction, onInstanceSuccess, errorToString, onInstanceError, hasResult);
+    const [fetchCB] = useDeferredFetch(fetchFunction, onInstanceSuccess, errorToString, onInstanceError);
 
     const fetchCallback = useCallback(
         (cbParamsList: unknown[][]) => {