diff --git a/src/ts/component/page/auth/onboard.tsx b/src/ts/component/page/auth/onboard.tsx
index f81ad0f547..9550175324 100644
--- a/src/ts/component/page/auth/onboard.tsx
+++ b/src/ts/component/page/auth/onboard.tsx
@@ -12,6 +12,7 @@ enum Stage {
 const PageAuthOnboard = observer(forwardRef<{}, I.PageComponent>(() => {
 
 	const { account } = S.Auth;
+	const { redirect } = S.Common;
 	const nodeRef = useRef(null);
 	const frameRef = useRef(null);
 	const phraseRef = useRef(null);
@@ -61,24 +62,30 @@ const PageAuthOnboard = observer(forwardRef<{}, I.PageComponent>(() => {
 				S.Common.getRef('mainAnimation')?.destroy();
 				U.Space.initSpaceState();
 
-				const newRouteParam = { replace: true };
-
-				if (S.Auth.startingId) {
-					U.Object.getById(S.Auth.startingId, {}, object => {
-						if (object) {
-							U.Object.openRoute(object, newRouteParam);
-						} else {
-							U.Space.openDashboard(newRouteParam);
-						};
-					});
-				} else {
-					U.Space.openDashboard(newRouteParam);
-				};
+				const routeParam = { replace: true };
 
 				Storage.set('primitivesOnboarding', true);
 				Storage.setOnboarding('objectDescriptionButton');
 				Storage.setOnboarding('typeResetLayout');
 
+				if (redirect) {
+					U.Router.go(redirect, routeParam);
+					S.Common.redirectSet('');
+					return;
+				};
+
+				if (S.Auth.startingId) {
+					U.Object.getById(S.Auth.startingId, {}, object => {
+						if (object) {
+							U.Object.openRoute(object, routeParam);
+						} else {
+							U.Space.openDashboard(routeParam);
+						};
+					});
+				} else {
+					U.Space.openDashboard(routeParam);
+				};
+
 				Onboarding.start('basics', false);
 			},
 		};
diff --git a/src/ts/component/page/auth/pinCheck.tsx b/src/ts/component/page/auth/pinCheck.tsx
index b3709b39ea..b43a5513fb 100644
--- a/src/ts/component/page/auth/pinCheck.tsx
+++ b/src/ts/component/page/auth/pinCheck.tsx
@@ -35,6 +35,8 @@ const PageAuthPinCheck = observer(forwardRef<{}, I.PageComponent>(() => {
 		} else {
 			U.Router.go('/', routeParam);
 		};
+
+		S.Common.redirectSet('');
 	};
 
 	useEffect(() => {
diff --git a/src/ts/component/page/main/invite.tsx b/src/ts/component/page/main/invite.tsx
index 12757ac327..f0a07cb0e3 100644
--- a/src/ts/component/page/main/invite.tsx
+++ b/src/ts/component/page/main/invite.tsx
@@ -1,6 +1,6 @@
 import React, { forwardRef, useRef, useState, useImperativeHandle, useEffect } from 'react';
 import { Loader, Title, Error, Frame, Button, Footer } from 'Component';
-import { I, C, S, U, J, translate, Preview } from 'Lib';
+import { I, C, S, U, J, translate, Preview, Onboarding } from 'Lib';
 
 interface PageMainInviteRefProps {
 	resize: () => void;
@@ -8,7 +8,7 @@ interface PageMainInviteRefProps {
 
 const PageMainInvite = forwardRef<PageMainInviteRefProps, I.PageComponent>((props, ref) => {
 
-	const { isPopup, match, location } = props;
+	const { isPopup, location } = props;
 	const nodeRef = useRef(null);
 	const frameRef = useRef(null);
 	const cidRef = useRef('');
@@ -27,6 +27,7 @@ const PageMainInvite = forwardRef<PageMainInviteRefProps, I.PageComponent>((prop
 
 		const request = (invite) => {
 			S.Popup.open('inviteRequest', { 
+				onClose: () => Onboarding.start('basics', isPopup),
 				data: { 
 					invite, 
 					cid, 
@@ -98,6 +99,7 @@ const PageMainInvite = forwardRef<PageMainInviteRefProps, I.PageComponent>((prop
 							const creatorName = message.creatorName || translate('defaultNamePage');
 
 							S.Popup.open('confirm', {
+								onClose: () => Onboarding.start('basics', isPopup),
 								data: {
 									icon: 'join',
 									title: U.Common.sprintf(translate('popupConfirmJoinSpaceTitle'), spaceName),
diff --git a/src/ts/component/sidebar/left.tsx b/src/ts/component/sidebar/left.tsx
index 2a626edff3..603af71720 100644
--- a/src/ts/component/sidebar/left.tsx
+++ b/src/ts/component/sidebar/left.tsx
@@ -154,8 +154,6 @@ const SidebarLeft = observer(class SidebarLeft extends React.Component<{}, State
 		};
 
 		this.frame = raf(() => {
-			console.log('onResizeMove', e.pageX, sidebar.isAnimating);
-
 			if (sidebar.isAnimating) {
 				return;
 			};
diff --git a/src/ts/lib/sidebar.ts b/src/ts/lib/sidebar.ts
index 2fc3d3f4ca..e10ef03589 100644
--- a/src/ts/lib/sidebar.ts
+++ b/src/ts/lib/sidebar.ts
@@ -100,8 +100,6 @@ class Sidebar {
 		this.resizePage(0, null, true);
 		this.vaultHide();
 
-		console.log('CLOSE');
-
 		this.removeAnimation(() => {
 			this.objLeft.addClass('isClosed');
 
@@ -127,8 +125,6 @@ class Sidebar {
 		this.setAnimating(true);
 		this.vaultShow(width);
 
-		console.log('OPEN');
-
 		window.clearTimeout(this.timeoutAnim);
 		this.timeoutAnim = window.setTimeout(() => {
 			this.objLeft.removeClass('isClosed');
diff --git a/src/ts/lib/util/data.ts b/src/ts/lib/util/data.ts
index 0983c2a3d7..f70cf31b5b 100644
--- a/src/ts/lib/util/data.ts
+++ b/src/ts/lib/util/data.ts
@@ -267,6 +267,8 @@ class UtilData {
 						};
 					};
 
+					S.Common.redirectSet('');
+
 					if (callBack) {
 						callBack();
 					};
diff --git a/src/ts/lib/util/router.ts b/src/ts/lib/util/router.ts
index 87a59faf33..9a887b933f 100644
--- a/src/ts/lib/util/router.ts
+++ b/src/ts/lib/util/router.ts
@@ -108,7 +108,6 @@ class UtilRouter {
 
 		S.Menu.closeAll();
 		S.Popup.closeAll();
-		S.Common.redirectSet('');
 		sidebar.rightPanelToggle(false, false, keyboard.isPopup());
 
 		if (routeParam.spaceId && ![ space ].includes(routeParam.spaceId)) {