diff --git a/packages/app/src/app/pages/common/Modals/SurveyModal/SurveyModal.tsx b/packages/app/src/app/pages/common/Modals/SurveyModal/SurveyModal.tsx
index 057bef98a9c..6e062c76b34 100644
--- a/packages/app/src/app/pages/common/Modals/SurveyModal/SurveyModal.tsx
+++ b/packages/app/src/app/pages/common/Modals/SurveyModal/SurveyModal.tsx
@@ -1,38 +1,42 @@
-import React from 'react';
-import * as typeformEmbed from '@typeform/embed';
 import hash from '@codesandbox/common/lib/utils/hash';
-import { inject, hooksObserver } from 'app/componentConnectors';
+import * as typeformEmbed from '@typeform/embed';
+import React, { FunctionComponent } from 'react';
+
+import { useOvermind } from 'app/overmind';
 
 import { Container } from './elements';
 
-export const SurveyModal = inject('store', 'signals')(
-  hooksObserver(({ store, signals }) => {
-    const initializeTypeform = (el: HTMLDivElement) => {
-      if (el) {
-        typeformEmbed.makeWidget(
-          el,
-          `https://codesandbox.typeform.com/to/LYbjII?userid=${hash(
-            store.user.id
-          )}&ispatron=${store.isPatron}`,
-          {
-            opacity: 0,
-            hideScrollbars: true,
-            hideFooter: true,
-            hideHeaders: true,
-            onSubmit: () => {
-              setTimeout(() => {
-                signals.modalClosed();
-              }, 3000);
-            },
-          }
-        );
-      }
-    };
+export const SurveyModal: FunctionComponent = () => {
+  const {
+    actions: { modalClosed },
+    state: { isPatron, user },
+  } = useOvermind();
+
+  const initializeTypeform = (el?: HTMLDivElement) => {
+    if (el) {
+      typeformEmbed.makeWidget(
+        el,
+        `https://codesandbox.typeform.com/to/LYbjII?userid=${hash(
+          user.id
+        )}&ispatron=${isPatron}`,
+        {
+          opacity: 0,
+          hideScrollbars: true,
+          hideFooter: true,
+          hideHeaders: true,
+          onSubmit: () => {
+            setTimeout(() => {
+              modalClosed();
+            }, 3000);
+          },
+        }
+      );
+    }
+  };
 
-    return (
-      <Container>
-        <div style={{ width: '100%', height: 500 }} ref={initializeTypeform} />
-      </Container>
-    );
-  })
-);
+  return (
+    <Container>
+      <div style={{ width: '100%', height: 500 }} ref={initializeTypeform} />
+    </Container>
+  );
+};