diff --git a/packages/ui-components/src/lib/components/deployment/DeploymentSteps.svelte b/packages/ui-components/src/lib/components/deployment/DeploymentSteps.svelte
index 261cdbcfc..923d22520 100644
--- a/packages/ui-components/src/lib/components/deployment/DeploymentSteps.svelte
+++ b/packages/ui-components/src/lib/components/deployment/DeploymentSteps.svelte
@@ -79,7 +79,7 @@
 
 			if (gui) {
 				try {
-					selectTokens = await gui.getSelectTokens();
+					selectTokens = gui.getSelectTokens();
 					return selectTokens;
 				} catch (e) {
 					error = DeploymentStepErrors.NO_SELECT_TOKENS;
@@ -220,6 +220,8 @@
 		if (gui) {
 			try {
 				allTokensSelected = gui?.areAllTokensSelected();
+				if (!allTokensSelected) return;
+
 				const vaultIds = gui?.getVaultIds();
 				const inputVaultIds = vaultIds?.get('input');
 				const outputVaultIds = vaultIds?.get('output');
diff --git a/packages/ui-components/src/lib/components/deployment/SelectToken.svelte b/packages/ui-components/src/lib/components/deployment/SelectToken.svelte
index 9c1e961e6..581681989 100644
--- a/packages/ui-components/src/lib/components/deployment/SelectToken.svelte
+++ b/packages/ui-components/src/lib/components/deployment/SelectToken.svelte
@@ -14,9 +14,13 @@
 	let checking = false;
 
 	onMount(async () => {
-		tokenInfo = await gui?.getTokenInfo(token.key);
-		if (tokenInfo?.address) {
-			inputValue = tokenInfo.address;
+		try {
+			tokenInfo = await gui?.getTokenInfo(token.key);
+			if (tokenInfo?.address) {
+				inputValue = tokenInfo.address;
+			}
+		} catch {
+			// do nothing
 		}
 	});