diff --git a/.eslintrc.js b/.eslintrc.js
index b1749d46a..42d26799f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -129,9 +129,8 @@ module.exports = {
           // There is an issue with the current version of react-use where it requires an arbitrary 'Locale' package on the window object which causes random app crashes on startup in some cases
           {
             name: 'react-use',
-            importNames: ['useMount'],
             message:
-              "Don't import it from 'react-use' directly. Please use a default import from 'react-use/lib/useMount' instead.",
+              "Don't import from 'react-use' directly. Please use a default import for each hook from 'react-use/lib' instead.",
           },
         ],
       },
diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
index bb64cbd35..e8e0b626f 100644
--- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx
+++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -4,7 +4,8 @@ import { Dispatch, useCallback, useEffect, useRef, useState } from 'react';
 import { isNumber } from 'lodash';
 import { Item, ItemParams, Menu, useContextMenu } from 'react-contexify';
 import { useDispatch } from 'react-redux';
-import { useClickAway, useMouse } from 'react-use';
+import useClickAway from 'react-use/lib/useClickAway';
+import useMouse from 'react-use/lib/useMouse';
 import styled from 'styled-components';
 import { Data } from '../../../../data/data';
 
diff --git a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx
index cf92e9474..6047b4f4c 100644
--- a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import { useInterval } from 'react-use';
+import useInterval from 'react-use/lib/useInterval';
 import useMount from 'react-use/lib/useMount';
 import styled from 'styled-components';
 import { useIsDetailMessageView } from '../../../../contexts/isDetailViewContext';
diff --git a/ts/components/conversation/message/reactions/Reaction.tsx b/ts/components/conversation/message/reactions/Reaction.tsx
index 0ab95666f..a82de029d 100644
--- a/ts/components/conversation/message/reactions/Reaction.tsx
+++ b/ts/components/conversation/message/reactions/Reaction.tsx
@@ -1,5 +1,5 @@
 import { useRef, useState } from 'react';
-import { useMouse } from 'react-use';
+import useMouse from 'react-use/lib/useMouse';
 import styled from 'styled-components';
 import { useRightOverlayMode } from '../../../../hooks/useUI';
 import { isUsAnySogsFromCache } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 668d49d93..06bc7749b 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -1,7 +1,7 @@
 import { isEmpty } from 'lodash';
 import { useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { useKey } from 'react-use';
+import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 import { Avatar, AvatarSize } from '../avatar/Avatar';