diff --git a/app/containers/Passcode/PasscodeEnter.js b/app/containers/Passcode/PasscodeEnter.js
index 10cf094b8..5da355677 100644
--- a/app/containers/Passcode/PasscodeEnter.js
+++ b/app/containers/Passcode/PasscodeEnter.js
@@ -3,6 +3,7 @@ import { useAsyncStorage } from '@react-native-community/async-storage';
 import RNUserDefaults from 'rn-user-defaults';
 import PropTypes from 'prop-types';
 import { gestureHandlerRootHOC } from 'react-native-gesture-handler';
+import * as LocalAuthentication from 'expo-local-authentication';
 
 import Base from './Base';
 import Locked from './Locked';
@@ -41,8 +42,16 @@ const PasscodeEnter = ({ theme, finishProcess }) => {
 		fetchPasscode();
 	};
 
+	const biometry = async() => {
+		const result = await LocalAuthentication.authenticateAsync({ disableDeviceFallback: true });
+		if (result?.success) {
+			finishProcess();
+		}
+	};
+
 	useEffect(() => {
 		readStorage();
+		biometry();
 	}, []);
 
 	const onEndProcess = (p) => {
diff --git a/app/utils/localAuthentication.js b/app/utils/localAuthentication.js
index 7f1ebca15..20ace803e 100644
--- a/app/utils/localAuthentication.js
+++ b/app/utils/localAuthentication.js
@@ -28,9 +28,8 @@ export const saveLastLocalAuthenticationSession = async(server, serverRecord) =>
 
 export const resetAttempts = () => AsyncStorage.multiRemove([LOCKED_OUT_TIMER_KEY, ATTEMPTS_KEY]);
 
-export const localPasscode = () => new Promise((resolve, reject) => {
+export const openModal = () => new Promise((resolve) => {
 	EventEmitter.emit(LOCAL_AUTHENTICATE_EMITTER, {
-		cancel: () => reject(),
 		submit: () => resolve()
 	});
 });
@@ -57,29 +56,8 @@ export const localAuthenticate = async(server) => {
 			// Make sure splash screen has been hidden
 			RNBootSplash.hide();
 
-			// if biometry is enabled on the app
-			if (serverRecord?.biometry) {
-				const isEnrolled = await LocalAuthentication.isEnrolledAsync();
-				const isSupported = await LocalAuthentication.supportedAuthenticationTypesAsync();
-
-				// if biometry is enabled and enrolled on OS
-				if (isEnrolled && isSupported?.length) {
-					// opens biometry prompt
-					let authResult;
-					try {
-						authResult = await LocalAuthentication.authenticateAsync({ disableDeviceFallback: true });
-					} catch (e) {
-						// Do nothing
-					}
-					if (!authResult?.success) {
-						await localPasscode();
-					}
-				} else {
-					await localPasscode();
-				}
-			} else {
-				await localPasscode();
-			}
+			// Authenticate
+			await openModal();
 		}
 
 		//