diff --git a/app/soapbox/components/ui/accordion/accordion.tsx b/app/soapbox/components/ui/accordion/accordion.tsx
index 299848d84..c6a2e00d1 100644
--- a/app/soapbox/components/ui/accordion/accordion.tsx
+++ b/app/soapbox/components/ui/accordion/accordion.tsx
@@ -2,9 +2,12 @@ import classNames from 'clsx';
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
-import { HStack, Icon, Text } from 'soapbox/components/ui';
 import DropdownMenu from 'soapbox/containers/dropdown-menu-container';
 
+import HStack from '../hstack/hstack';
+import Icon from '../icon/icon';
+import Text from '../text/text';
+
 import type { Menu } from 'soapbox/components/dropdown-menu';
 
 const messages = defineMessages({
diff --git a/app/soapbox/hooks/useAccount.ts b/app/soapbox/hooks/useAccount.ts
index 471df571a..e8dfff152 100644
--- a/app/soapbox/hooks/useAccount.ts
+++ b/app/soapbox/hooks/useAccount.ts
@@ -1,6 +1,8 @@
 import { useAppSelector } from 'soapbox/hooks';
 import { makeGetAccount } from 'soapbox/selectors';
 
-const getAccount = makeGetAccount();
+export const useAccount = (id: string) => {
+  const getAccount = makeGetAccount();
 
-export const useAccount = (id: string) => useAppSelector((state) => getAccount(state, id));
+  return useAppSelector((state) => getAccount(state, id));
+};