diff --git a/src/containers/dialogs/EditorEditDialog/index.tsx b/src/containers/dialogs/EditorEditDialog/index.tsx
index 94530312..6cd44ae6 100644
--- a/src/containers/dialogs/EditorEditDialog/index.tsx
+++ b/src/containers/dialogs/EditorEditDialog/index.tsx
@@ -5,6 +5,7 @@ import { ModalWrapper } from '~/components/dialogs/ModalWrapper';
 import { LoaderCircle } from '~/components/input/LoaderCircle';
 import styles from './styles.module.scss';
 import { useGetNode } from '~/utils/hooks/data/useGetNode';
+import { EMPTY_NODE } from '~/redux/node/constants';
 
 const EditorEditDialog: FC = () => {
   const history = useHistory();
@@ -34,7 +35,7 @@ const EditorEditDialog: FC = () => {
     );
   }
 
-  return <EditorDialog node={node} onRequestClose={goBack} />;
+  return <EditorDialog node={node || EMPTY_NODE} onRequestClose={goBack} />;
 };
 
 export { EditorEditDialog };
diff --git a/src/utils/hooks/useFileUploader.tsx b/src/utils/hooks/useFileUploader.tsx
index 3e2910e6..4d6b834b 100644
--- a/src/utils/hooks/useFileUploader.tsx
+++ b/src/utils/hooks/useFileUploader.tsx
@@ -15,7 +15,7 @@ import { useDispatch } from 'react-redux';
 import { uploadUploadFiles } from '~/redux/uploads/actions';
 import { useShallowSelect } from '~/utils/hooks/useShallowSelect';
 import { selectUploads } from '~/redux/uploads/selectors';
-import { has, path } from 'ramda';
+import { path } from 'ramda';
 import { IUploadStatus } from '~/redux/uploads/reducer';
 
 export const useFileUploader = (
@@ -66,7 +66,7 @@ export const useFileUploader = (
       setPendingIDs(newPending);
       setFiles([...files, ...added]);
     }
-  }, [statuses, files, pendingIDs, uploadedFiles]);
+  }, [statuses, files, pendingIDs, setFiles, setPendingIDs, uploadedFiles]);
 
   const pending = useMemo(() => pendingIDs.map(id => statuses[id]).filter(el => !!el), [
     statuses,
diff --git a/src/utils/hooks/useNodeFormFormik.ts b/src/utils/hooks/useNodeFormFormik.ts
index 81aa1e9b..37e3745e 100644
--- a/src/utils/hooks/useNodeFormFormik.ts
+++ b/src/utils/hooks/useNodeFormFormik.ts
@@ -61,9 +61,14 @@ export const useNodeFormFormik = (
     validateOnChange: true,
   });
 
-  useEffect(() => {
-    formik.setFieldValue('files', uploader.files);
-  }, [formik, formik.setFieldValue, uploader.files]);
+  useEffect(
+    () => {
+      formik.setFieldValue('files', uploader.files);
+    },
+    // because it breaks files logic
+    // eslint-disable-next-line
+    [uploader.files, formik.setFieldValue]
+  );
 
   return formik;
 };