diff --git a/src/navigation/onboarding/OnboardingNavigator.tsx b/src/navigation/onboarding/OnboardingNavigator.tsx
index 5aacd2a97..7b5865326 100644
--- a/src/navigation/onboarding/OnboardingNavigator.tsx
+++ b/src/navigation/onboarding/OnboardingNavigator.tsx
@@ -13,6 +13,7 @@ import CreateWallet, {
 import { NavigationContainer } from '../../styles/components';
 import { useAppSelector } from '../../hooks/redux';
 import { requiresRemoteRestoreSelector } from '../../store/reselect/user';
+import { walletExistsSelector } from '../../store/reselect/wallet';
 
 export type OnboardingStackParamList = {
 	TermsOfUse: undefined;
@@ -38,13 +39,15 @@ const navOptionHandlerNoBack = {
 
 const OnboardingNavigator = (): ReactElement => {
 	const requiresRemoteRestore = useAppSelector(requiresRemoteRestoreSelector);
+	const walletExists = useAppSelector(walletExistsSelector);
+
+	// If a wallet exists but remote LDK revocery is not complete, show the CreateWallet screen
+	const initialRouteName =
+		walletExists && requiresRemoteRestore ? 'CreateWallet' : 'TermsOfUse';
 
 	return (
 		<NavigationContainer>
-			<Stack.Navigator
-				initialRouteName={
-					requiresRemoteRestore ? 'CreateWallet' : 'TermsOfUse'
-				}>
+			<Stack.Navigator initialRouteName={initialRouteName}>
 				<Stack.Screen
 					name="TermsOfUse"
 					component={TermsOfUse}
diff --git a/src/screens/Onboarding/CreateWallet.tsx b/src/screens/Onboarding/CreateWallet.tsx
index cded10224..3392c942c 100644
--- a/src/screens/Onboarding/CreateWallet.tsx
+++ b/src/screens/Onboarding/CreateWallet.tsx
@@ -120,7 +120,7 @@ const CreateWallet = ({
 			return;
 		}
 
-		if (params?.action === 'create') {
+		if (params.action === 'create') {
 			handleCreate(params.bip39Passphrase);
 		} else {
 			handleRestore(params.mnemonic, params.bip39Passphrase);
diff --git a/src/screens/Onboarding/Slideshow.tsx b/src/screens/Onboarding/Slideshow.tsx
index 7e790bf85..a608e286c 100644
--- a/src/screens/Onboarding/Slideshow.tsx
+++ b/src/screens/Onboarding/Slideshow.tsx
@@ -1,36 +1,38 @@
 import React, {
-	memo,
 	ReactElement,
-	useState,
-	useRef,
-	useMemo,
-	useEffect,
+	memo,
 	useCallback,
+	useEffect,
+	useMemo,
+	useRef,
+	useState,
 } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
 import {
 	Image,
 	ImageSourcePropType,
+	Platform,
 	StyleSheet,
 	View,
 	useWindowDimensions,
-	Platform,
 } from 'react-native';
-import Carousel, { ICarouselInstance } from 'react-native-reanimated-carousel';
 import Animated, {
 	interpolate,
 	useAnimatedStyle,
 	useSharedValue,
 } from 'react-native-reanimated';
-import { Trans, useTranslation } from 'react-i18next';
+import Carousel, { ICarouselInstance } from 'react-native-reanimated-carousel';
 
-import { View as ThemedView } from '../../styles/components';
-import { Display, BodyM, BodyMB } from '../../styles/text';
-import { IThemeColors } from '../../styles/themes';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Dot from '../../components/SliderDots';
 import Button from '../../components/buttons/Button';
 import ButtonTertiary from '../../components/buttons/ButtonTertiary';
+import { useAppDispatch } from '../../hooks/redux';
 import type { OnboardingStackScreenProps } from '../../navigation/types';
+import { updateUser } from '../../store/slices/user';
+import { View as ThemedView } from '../../styles/components';
+import { BodyM, BodyMB, Display } from '../../styles/text';
+import { IThemeColors } from '../../styles/themes';
 
 type Slide = {
 	color: keyof IThemeColors;
@@ -134,6 +136,7 @@ const Slideshow = ({
 }: OnboardingStackScreenProps<'Slideshow'>): ReactElement => {
 	const skipIntro = route.params?.skipIntro ?? false;
 	const bip39Passphrase = route.params?.bip39Passphrase;
+	const dispatch = useAppDispatch();
 	const dimensions = useWindowDimensions();
 	const { t } = useTranslation('onboarding');
 	const ref = useRef<ICarouselInstance>(null);
@@ -169,11 +172,12 @@ const Slideshow = ({
 	};
 
 	const onCreateWallet = useCallback(async (): Promise<void> => {
+		dispatch(updateUser({ requiresRemoteRestore: false }));
 		navigation.navigate('CreateWallet', {
 			action: 'create',
 			bip39Passphrase,
 		});
-	}, [bip39Passphrase, navigation]);
+	}, [bip39Passphrase, dispatch, navigation]);
 
 	const onRestoreWallet = (): void => {
 		navigation.navigate('MultipleDevices');