diff --git a/web/app/(shareLayout)/layout.tsx b/web/app/(shareLayout)/layout.tsx
index 8db336a17d..7de5d51edb 100644
--- a/web/app/(shareLayout)/layout.tsx
+++ b/web/app/(shareLayout)/layout.tsx
@@ -12,12 +12,18 @@ const Layout: FC<{
 }> = ({ children }) => {
   const isGlobalPending = useGlobalPublicStore(s => s.isGlobalPending)
   const setWebAppAccessMode = useGlobalPublicStore(s => s.setWebAppAccessMode)
+  const systemFeatures = useGlobalPublicStore(s => s.systemFeatures)
   const pathname = usePathname()
   const searchParams = useSearchParams()
   const redirectUrl = searchParams.get('redirect_url')
   const [isLoading, setIsLoading] = useState(true)
   useEffect(() => {
     (async () => {
+      if (!systemFeatures.webapp_auth.enabled) {
+        setIsLoading(false)
+        return
+      }
+
       let appCode: string | null = null
       if (redirectUrl)
         appCode = redirectUrl?.split('/').pop() || null