diff --git a/packages/app/src/app/pages/common/Modals/FeedbackModal/index.js b/packages/app/src/app/pages/common/Modals/FeedbackModal/index.js
deleted file mode 100644
index a189276cc1d..00000000000
--- a/packages/app/src/app/pages/common/Modals/FeedbackModal/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-
-import { inject, hooksObserver } from 'app/componentConnectors';
-import Loadable from 'app/utils/Loadable';
-
-import { Heading, Container } from '../elements';
-
-const Feedback = Loadable(() =>
-  import(/* webpackChunkName: 'feedback' */ './Feedback')
-);
-
-const FeedbackModal = ({ store }) => (
-  <Container>
-    <Heading>Submit Feedback</Heading>
-
-    <Feedback user={store.user} id={store.editor.currentId} />
-  </Container>
-);
-
-export default inject('store')(hooksObserver(FeedbackModal));
diff --git a/packages/app/src/app/pages/common/Modals/FeedbackModal/index.tsx b/packages/app/src/app/pages/common/Modals/FeedbackModal/index.tsx
new file mode 100644
index 00000000000..28216dfc5e3
--- /dev/null
+++ b/packages/app/src/app/pages/common/Modals/FeedbackModal/index.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+
+import { useOvermind } from 'app/overmind';
+import Loadable from 'app/utils/Loadable';
+
+import { Heading, Container } from '../elements';
+
+const Feedback = Loadable(() =>
+  import(/* webpackChunkName: 'feedback' */ './Feedback')
+);
+
+export const FeedbackModal: React.FC = () => {
+  const {
+    state: {
+      user,
+      editor: { currentId },
+    },
+  } = useOvermind();
+
+  return (
+    <Container>
+      <Heading>Submit Feedback</Heading>
+
+      <Feedback user={user} id={currentId} />
+    </Container>
+  );
+};
diff --git a/packages/app/src/app/pages/common/Modals/index.js b/packages/app/src/app/pages/common/Modals/index.js
index 65892adeb52..cd6cbf9f560 100644
--- a/packages/app/src/app/pages/common/Modals/index.js
+++ b/packages/app/src/app/pages/common/Modals/index.js
@@ -15,7 +15,7 @@ import DeleteSandboxModal from './DeleteSandboxModal';
 import DeploymentModal from './DeploymentModal';
 import EmptyTrash from './EmptyTrash';
 import ExportGitHubModal from './ExportGitHubModal';
-import FeedbackModal from './FeedbackModal';
+import { FeedbackModal } from './FeedbackModal';
 import { ForkServerModal } from './ForkServerModal';
 import LiveSessionEnded from './LiveSessionEnded';
 import LiveSessionVersionMismatch from './LiveSessionVersionMismatch';