diff --git a/src/components/common/user/UserIcon.tsx b/src/components/common/user/UserIcon.tsx
index c1eade4a..3c19ecdb 100644
--- a/src/components/common/user/UserIcon.tsx
+++ b/src/components/common/user/UserIcon.tsx
@@ -56,7 +56,8 @@ export default observer(
                 keyof Props | "children" | "as"
             >,
     ) => {
-        const client = useApplicationState().client!;
+        // ! TODO: this is temporary code
+        const client = useClient() ?? useApplicationState().client!;
 
         const {
             target,
diff --git a/src/pages/invite/Invite.tsx b/src/pages/invite/Invite.tsx
index b11f0d96..c92ae072 100644
--- a/src/pages/invite/Invite.tsx
+++ b/src/pages/invite/Invite.tsx
@@ -1,5 +1,4 @@
 import { ArrowBack } from "@styled-icons/boxicons-regular";
-import { autorun } from "mobx";
 import { Redirect, useHistory, useParams } from "react-router-dom";
 import { API } from "revolt.js";