diff --git a/.eslintrc.json b/.eslintrc.json
index 258d855ee..e3d490836 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -18,6 +18,7 @@
   "extends": [
     "eslint:recommended",
     "plugin:react/recommended",
+    "plugin:react-hooks/recommended",
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:@typescript-eslint/recommended-requiring-type-checking",
diff --git a/package-lock.json b/package-lock.json
index d7ebbda2a..2a6c42ad2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -80,6 +80,7 @@
         "eslint-plugin-import": "2.27.5",
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-react": "7.32.2",
+        "eslint-plugin-react-hooks": "4.6.0",
         "eslint-plugin-simple-import-sort": "10.0.0",
         "eslint-plugin-storybook": "0.6.11",
         "eslint-plugin-unused-imports": "2.0.0",
@@ -22245,6 +22246,18 @@
         "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+      }
+    },
     "node_modules/eslint-plugin-react/node_modules/doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
diff --git a/package.json b/package.json
index 242d98253..2470686e9 100644
--- a/package.json
+++ b/package.json
@@ -144,6 +144,7 @@
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-react": "7.32.2",
+    "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-simple-import-sort": "10.0.0",
     "eslint-plugin-storybook": "0.6.11",
     "eslint-plugin-unused-imports": "2.0.0",
diff --git a/src/sections/collection/datasets-list/DatasetsList.tsx b/src/sections/collection/datasets-list/DatasetsList.tsx
index cd44c661a..a72202af2 100644
--- a/src/sections/collection/datasets-list/DatasetsList.tsx
+++ b/src/sections/collection/datasets-list/DatasetsList.tsx
@@ -32,7 +32,7 @@ export function DatasetsList({ datasetRepository, page, collectionId }: Datasets
 
   useEffect(() => {
     setIsLoading(isLoading)
-  }, [isLoading])
+  }, [isLoading, setIsLoading])
 
   if (isLoading) {
     return <DatasetsListSkeleton />
diff --git a/src/sections/collection/datasets-list/DatasetsListWithInfiniteScroll.tsx b/src/sections/collection/datasets-list/DatasetsListWithInfiniteScroll.tsx
index dd962ddeb..d757ccbb4 100644
--- a/src/sections/collection/datasets-list/DatasetsListWithInfiniteScroll.tsx
+++ b/src/sections/collection/datasets-list/DatasetsListWithInfiniteScroll.tsx
@@ -52,7 +52,7 @@ export function DatasetsListWithInfiniteScroll({
 
   useEffect(() => {
     setIsLoading(isLoading)
-  }, [isLoading])
+  }, [isLoading, setIsLoading])
 
   useEffect(() => {
     const updatePaginationTotalItems = () => {
diff --git a/src/sections/create-dataset/useGetMetadataBlocksInfo.tsx b/src/sections/create-dataset/useGetMetadataBlocksInfo.tsx
index 203c2fe7e..4ee7eab4f 100644
--- a/src/sections/create-dataset/useGetMetadataBlocksInfo.tsx
+++ b/src/sections/create-dataset/useGetMetadataBlocksInfo.tsx
@@ -49,7 +49,7 @@ export const useGetMetadataBlocksInfo = ({
       }
     }
     void handleGetDatasetMetadataBlockFields()
-  }, [])
+  }, [collectionId, metadataBlockInfoRepository])
 
   return {
     metadataBlocks,
diff --git a/src/sections/dataset/Dataset.tsx b/src/sections/dataset/Dataset.tsx
index 8acd6dd59..6cc83be9c 100644
--- a/src/sections/dataset/Dataset.tsx
+++ b/src/sections/dataset/Dataset.tsx
@@ -38,7 +38,7 @@ export function Dataset({ fileRepository, created }: DatasetProps) {
   }
   useEffect(() => {
     setIsLoading(isLoading)
-  }, [isLoading])
+  }, [isLoading, setIsLoading])
 
   if (isLoading) {
     return <DatasetSkeleton />
diff --git a/src/sections/dataset/DatasetFactory.tsx b/src/sections/dataset/DatasetFactory.tsx
index c80597b45..cafed8de4 100644
--- a/src/sections/dataset/DatasetFactory.tsx
+++ b/src/sections/dataset/DatasetFactory.tsx
@@ -54,7 +54,7 @@ function DatasetWithSearchParams() {
 
   useEffect(() => {
     if (privateUrlToken) setAnonymizedView(true)
-  }, [privateUrlToken])
+  }, [privateUrlToken, setAnonymizedView])
 
   if (privateUrlToken) {
     return (
diff --git a/src/sections/dataset/DatasetProvider.tsx b/src/sections/dataset/DatasetProvider.tsx
index 41ebd2504..e121485aa 100644
--- a/src/sections/dataset/DatasetProvider.tsx
+++ b/src/sections/dataset/DatasetProvider.tsx
@@ -1,4 +1,4 @@
-import { PropsWithChildren, useEffect, useState } from 'react'
+import { PropsWithChildren, useCallback, useEffect, useState } from 'react'
 import { DatasetContext } from './DatasetContext'
 import { DatasetRepository } from '../../dataset/domain/repositories/DatasetRepository'
 import { Dataset } from '../../dataset/domain/models/Dataset'
@@ -20,7 +20,8 @@ export function DatasetProvider({
 }: PropsWithChildren<DatasetProviderProps>) {
   const [dataset, setDataset] = useState<Dataset>()
   const [isLoading, setIsLoading] = useState(true)
-  const getDataset = () => {
+
+  const getDataset = useCallback(() => {
     if (searchParams.persistentId) {
       return getDatasetByPersistentId(repository, searchParams.persistentId, searchParams.version)
     }
@@ -28,7 +29,7 @@ export function DatasetProvider({
       return getDatasetByPrivateUrlToken(repository, searchParams.privateUrlToken)
     }
     return Promise.resolve(undefined)
-  }
+  }, [repository, searchParams])
 
   useEffect(() => {
     setIsLoading(true)
@@ -42,7 +43,7 @@ export function DatasetProvider({
         console.error('There was an error getting the dataset', error)
         setIsLoading(false)
       })
-  }, [repository, searchParams])
+  }, [repository, searchParams, getDataset])
 
   return (
     <DatasetContext.Provider value={{ dataset, isLoading }}>{children}</DatasetContext.Provider>
diff --git a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.tsx b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.tsx
index 18527ffb5..00f1e68f6 100644
--- a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.tsx
+++ b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.tsx
@@ -6,6 +6,8 @@ interface DeaccessionDatasetButtonProps {
   dataset: Dataset
 }
 export function DeaccessionDatasetButton({ dataset }: DeaccessionDatasetButtonProps) {
+  const { t } = useTranslation('dataset')
+
   if (
     !dataset.version.someDatasetVersionHasBeenReleased ||
     !dataset.permissions.canPublishDataset
@@ -13,7 +15,6 @@ export function DeaccessionDatasetButton({ dataset }: DeaccessionDatasetButtonPr
     return <></>
   }
 
-  const { t } = useTranslation('dataset')
   return (
     <>
       <DropdownSeparator />
diff --git a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.tsx b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.tsx
index 9a1eaf9f7..1e2b4a632 100644
--- a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.tsx
+++ b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.tsx
@@ -6,6 +6,8 @@ interface DeleteDatasetButtonProps {
   dataset: Dataset
 }
 export function DeleteDatasetButton({ dataset }: DeleteDatasetButtonProps) {
+  const { t } = useTranslation('dataset')
+
   if (
     !dataset.permissions.canDeleteDataset ||
     dataset.version.latestVersionPublishingStatus !== DatasetPublishingStatus.DRAFT
@@ -13,7 +15,6 @@ export function DeleteDatasetButton({ dataset }: DeleteDatasetButtonProps) {
     return <></>
   }
 
-  const { t } = useTranslation('dataset')
   return (
     <>
       <DropdownSeparator />
diff --git a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetPermissionsMenu.tsx b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetPermissionsMenu.tsx
index 7ef7f3282..5fccf6009 100644
--- a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetPermissionsMenu.tsx
+++ b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetPermissionsMenu.tsx
@@ -10,13 +10,6 @@ interface EditDatasetPermissionsMenuProps {
   dataset: Dataset
 }
 export function EditDatasetPermissionsMenu({ dataset }: EditDatasetPermissionsMenuProps) {
-  if (
-    !dataset.permissions.canManageDatasetPermissions &&
-    !dataset.permissions.canManageFilesPermissions
-  ) {
-    return <></>
-  }
-
   const { t } = useTranslation('dataset')
   const { getSettingByName } = useSettings()
   const [hasPublicStore, setHasPublicStore] = useState<HasPublicStore>(false)
@@ -31,6 +24,13 @@ export function EditDatasetPermissionsMenu({ dataset }: EditDatasetPermissionsMe
       })
   }, [getSettingByName])
 
+  if (
+    !dataset.permissions.canManageDatasetPermissions &&
+    !dataset.permissions.canManageFilesPermissions
+  ) {
+    return <></>
+  }
+
   if (hasPublicStore) {
     return (
       <DropdownButtonItem>
diff --git a/src/sections/dataset/dataset-action-buttons/publish-dataset-menu/PublishDatasetMenu.tsx b/src/sections/dataset/dataset-action-buttons/publish-dataset-menu/PublishDatasetMenu.tsx
index 6ea678467..b96fff849 100644
--- a/src/sections/dataset/dataset-action-buttons/publish-dataset-menu/PublishDatasetMenu.tsx
+++ b/src/sections/dataset/dataset-action-buttons/publish-dataset-menu/PublishDatasetMenu.tsx
@@ -11,6 +11,9 @@ interface PublishDatasetMenuProps {
 
 export function PublishDatasetMenu({ dataset }: PublishDatasetMenuProps) {
   const { user } = useSession()
+  const { t } = useTranslation('dataset')
+  const { showModal } = useNotImplementedModal()
+
   if (
     !dataset.version.isLatest ||
     dataset.version.publishingStatus !== DatasetPublishingStatus.DRAFT ||
@@ -20,12 +23,10 @@ export function PublishDatasetMenu({ dataset }: PublishDatasetMenuProps) {
     return <></>
   }
 
-  const { t } = useTranslation('dataset')
   const handleSelect = () => {
     // TODO - Implement upload files
     showModal()
   }
-  const { showModal } = useNotImplementedModal()
 
   return (
     <DropdownButton
diff --git a/src/sections/dataset/dataset-action-buttons/submit-for-review-button/SubmitForReviewButton.tsx b/src/sections/dataset/dataset-action-buttons/submit-for-review-button/SubmitForReviewButton.tsx
index b352b4065..c31c72ff1 100644
--- a/src/sections/dataset/dataset-action-buttons/submit-for-review-button/SubmitForReviewButton.tsx
+++ b/src/sections/dataset/dataset-action-buttons/submit-for-review-button/SubmitForReviewButton.tsx
@@ -9,6 +9,8 @@ interface SubmitForReviewButtonProps {
 
 export function SubmitForReviewButton({ dataset }: SubmitForReviewButtonProps) {
   const { user } = useSession()
+  const { t } = useTranslation('dataset')
+
   if (
     !dataset.version.isLatest ||
     dataset.version.publishingStatus !== DatasetPublishingStatus.DRAFT ||
@@ -20,7 +22,6 @@ export function SubmitForReviewButton({ dataset }: SubmitForReviewButtonProps) {
     return <></>
   }
 
-  const { t } = useTranslation('dataset')
   return (
     <Button
       variant="secondary"
diff --git a/src/sections/dataset/dataset-files/files-table/FilesTable.tsx b/src/sections/dataset/dataset-files/files-table/FilesTable.tsx
index 8bf0b8874..aca03aa38 100644
--- a/src/sections/dataset/dataset-files/files-table/FilesTable.tsx
+++ b/src/sections/dataset/dataset-files/files-table/FilesTable.tsx
@@ -32,21 +32,21 @@ export function FilesTable({
   )
   const [visitedPagination, setVisitedPagination] = useState<FilePaginationInfo>(paginationInfo)
   const [visitedFiles, setVisitedFiles] = useState<FileSelection>({})
+  const [previousCriteria, setPreviousCriteria] = useState<FileCriteria>(criteria)
 
   useEffect(() => {
     if (visitedPagination.page == paginationInfo.page) {
       setVisitedFiles((visitedFiles) => ({ ...visitedFiles, ...fileSelection }))
     }
     setVisitedPagination(paginationInfo)
-  }, [fileSelection])
+  }, [fileSelection, paginationInfo, visitedPagination.page])
 
-  const [previousCriteria, setPreviousCriteria] = useState<FileCriteria>(criteria)
   useEffect(() => {
     if (previousCriteria != criteria) {
       clearFileSelection()
     }
     setPreviousCriteria(criteria)
-  })
+  }, [criteria, previousCriteria, clearFileSelection])
 
   if (isLoading) {
     return <SpinnerSymbol />
diff --git a/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx b/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
index 1ffa88043..02e7be148 100644
--- a/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
+++ b/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
@@ -32,14 +32,16 @@ export function useFilesTable(files: FilePreview[], paginationInfo: FilePaginati
     pageCount: paginationInfo.totalPages
   })
 
+  const selectedRowsById = table.getSelectedRowModel().rowsById
+
   useEffect(() => {
     table.setPageSize(paginationInfo.pageSize)
     table.setPageIndex(paginationInfo.page - 1)
-  }, [paginationInfo])
+  }, [paginationInfo, table])
 
   useEffect(() => {
-    setCurrentPageSelectedRowModel(table.getSelectedRowModel().rowsById)
-  }, [table.getSelectedRowModel().rowsById])
+    setCurrentPageSelectedRowModel(selectedRowsById)
+  }, [selectedRowsById])
 
   return {
     table,
diff --git a/src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.tsx b/src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.tsx
index 47a39d1d9..32b7f55ef 100644
--- a/src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.tsx
+++ b/src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.tsx
@@ -41,7 +41,7 @@ export function ZipDownloadLimitMessage({
       filesTotalDownloadSize
     )
     setFileSelectionTotalSizeInInBytes(totalSize)
-  }, [fileSelection])
+  }, [fileSelection, visitedFiles, filesTotalDownloadSize])
 
   const showMessage =
     zipDownloadLimitInBytes &&
diff --git a/src/sections/dataset/dataset-metadata/dataset-metadata-fields/DatasetMetadataFields.tsx b/src/sections/dataset/dataset-metadata/dataset-metadata-fields/DatasetMetadataFields.tsx
index 8a6b74751..5cd70e011 100644
--- a/src/sections/dataset/dataset-metadata/dataset-metadata-fields/DatasetMetadataFields.tsx
+++ b/src/sections/dataset/dataset-metadata/dataset-metadata-fields/DatasetMetadataFields.tsx
@@ -17,7 +17,7 @@ export function DatasetMetadataFields({
 
   useEffect(() => {
     setMetadataBlockName(metadataBlockName)
-  }, [metadataBlockName])
+  }, [metadataBlockName, setMetadataBlockName])
 
   return (
     <>
diff --git a/src/sections/file/File.tsx b/src/sections/file/File.tsx
index 019099a9e..25412213e 100644
--- a/src/sections/file/File.tsx
+++ b/src/sections/file/File.tsx
@@ -28,7 +28,7 @@ export function File({ repository, id, datasetVersionNumber }: FileProps) {
 
   useEffect(() => {
     setIsLoading(isLoading)
-  }, [isLoading])
+  }, [isLoading, setIsLoading])
 
   if (isLoading) {
     return <FileSkeleton />
diff --git a/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx b/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx
index 9f43ae771..32ee4b222 100644
--- a/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx
+++ b/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx
@@ -30,6 +30,7 @@ type Story = StoryObj<typeof DatasetAlerts>
 export const UpdateAlerts: Story = {
   render: () => {
     const dataset = DatasetMother.createRealistic()
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const { addDatasetAlert } = useAlertContext()
     allUpdateAlerts.forEach((alert) => addDatasetAlert(alert))
     return (
@@ -44,6 +45,7 @@ const publishAlert = new Alert('warning', AlertMessageKey.PUBLISH_IN_PROGRESS)
 export const PublishInProgress: Story = {
   render: () => {
     const dataset = DatasetMother.createRealistic()
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const { addDatasetAlert } = useAlertContext()
     addDatasetAlert(publishAlert)
     return (