diff --git a/ts/components/session/registration/RegistrationStages.tsx b/ts/components/session/registration/RegistrationStages.tsx
index 537aa1ac5..4e6152fe0 100644
--- a/ts/components/session/registration/RegistrationStages.tsx
+++ b/ts/components/session/registration/RegistrationStages.tsx
@@ -160,11 +160,15 @@ export enum RegistrationPhase {
 interface RegistrationPhaseContext {
   registrationPhase: RegistrationPhase;
   setRegistrationPhase: (phase: RegistrationPhase) => void;
+  generatedRecoveryPhrase: string;
+  hexGeneratedPubKey: string;
 }
 
 export const RegistrationContext = createContext<RegistrationPhaseContext>({
   registrationPhase: RegistrationPhase.Start,
   setRegistrationPhase: () => undefined,
+  generatedRecoveryPhrase: '',
+  hexGeneratedPubKey: '',
 });
 
 export const RegistrationStages = () => {
@@ -199,15 +203,16 @@ export const RegistrationStages = () => {
 
   return (
     <div className="session-registration-container">
-      <RegistrationContext.Provider value={{ registrationPhase, setRegistrationPhase }}>
+      <RegistrationContext.Provider
+        value={{
+          registrationPhase,
+          setRegistrationPhase,
+          generatedRecoveryPhrase,
+          hexGeneratedPubKey,
+        }}
+      >
         {(registrationPhase === RegistrationPhase.Start ||
-          registrationPhase === RegistrationPhase.SignUp) && (
-          <SignUpTab
-            generatedRecoveryPhrase={generatedRecoveryPhrase}
-            hexGeneratedPubKey={hexGeneratedPubKey}
-            // setRegistrationPhase={setRegistrationPhase}
-          />
-        )}
+          registrationPhase === RegistrationPhase.SignUp) && <SignUpTab />}
         {(registrationPhase === RegistrationPhase.Start ||
           registrationPhase === RegistrationPhase.SignIn) && <SignInTab />}
       </RegistrationContext.Provider>
diff --git a/ts/components/session/registration/SignUpTab.tsx b/ts/components/session/registration/SignUpTab.tsx
index 171ebb6ea..8dddb7e15 100644
--- a/ts/components/session/registration/SignUpTab.tsx
+++ b/ts/components/session/registration/SignUpTab.tsx
@@ -11,12 +11,6 @@ export enum SignUpMode {
   EnterDetails,
 }
 
-export interface Props {
-  // tslint:disable: react-unused-props-and-state
-  generatedRecoveryPhrase: string;
-  hexGeneratedPubKey: string;
-}
-
 const CreateSessionIdButton = ({ createSessionID }: { createSessionID: any }) => {
   return (
     <SessionButton
@@ -61,8 +55,10 @@ const SignUpSessionIDShown = (props: { continueSignUp: () => void }) => {
   );
 };
 
-export const SignUpTab = (props: Props) => {
-  const { setRegistrationPhase } = useContext(RegistrationContext);
+export const SignUpTab = () => {
+  const { setRegistrationPhase, generatedRecoveryPhrase, hexGeneratedPubKey } = useContext(
+    RegistrationContext
+  );
 
   const [signUpMode, setSignUpMode] = useState(SignUpMode.Default);
   const [displayName, setDisplayName] = useState('');
@@ -70,7 +66,7 @@ export const SignUpTab = (props: Props) => {
 
   useEffect(() => {
     if (signUpMode === SignUpMode.SessionIDShown) {
-      window.Session.setNewSessionID(props.hexGeneratedPubKey);
+      window.Session.setNewSessionID(hexGeneratedPubKey);
     }
   }, [signUpMode]);
 
@@ -104,7 +100,7 @@ export const SignUpTab = (props: Props) => {
   const signUpWithDetails = async () => {
     await signUp({
       displayName,
-      generatedRecoveryPhrase: props.generatedRecoveryPhrase,
+      generatedRecoveryPhrase: generatedRecoveryPhrase,
     });
   };