diff --git a/packages/client/src/user/CurrentUserProvider.tsx b/packages/client/src/user/CurrentUserProvider.tsx
index f316be1123..49403cd066 100644
--- a/packages/client/src/user/CurrentUserProvider.tsx
+++ b/packages/client/src/user/CurrentUserProvider.tsx
@@ -16,7 +16,7 @@ export const CurrentUserProvider = (props) => {
   if (result.loading) {
     return <Spin />;
   }
-  if (result.error) {
+  if (!result?.data?.data?.id) {
     return <Redirect to={'/signin'} />;
   }
   return <CurrentUserContext.Provider value={result}>{props.children}</CurrentUserContext.Provider>;
diff --git a/packages/plugin-users/src/actions/users.ts b/packages/plugin-users/src/actions/users.ts
index 22e16e058f..266c7961aa 100644
--- a/packages/plugin-users/src/actions/users.ts
+++ b/packages/plugin-users/src/actions/users.ts
@@ -6,10 +6,10 @@ export async function check(ctx: Context, next: Next) {
   if (ctx.state.currentUser) {
     const user = ctx.state.currentUser.toJSON();
     ctx.body = user;
-    await next();
   } else {
-    ctx.throw(401, 'Unauthorized');
+    ctx.body = {};
   }
+  await next();
 }
 
 export async function signin(ctx: Context, next: Next) {